Changeset 435 for trunk/LocalPlayer/Term.pas

Timestamp:

May 4, 2022, 4:59:24 PM (3 years ago)

Author:

chronos

Message:

• Fixed: Possible exception during cities or units rename with right mouse click.
• Fixed: Gtk2Fix added to more places.
• Modified: Code cleanup;

File:

• trunk/LocalPlayer/Term.pas (modified) (16 diffs)

trunk/LocalPlayer/Term.pas

@@ -772 +772 @@
       result := 2;
     100:
-      result := 3
+      result := 3;
   end;
 end;
@@ -812 +812 @@
       Tribe[p].SetModelPicture(Picture, IsNew)
     else if IsNew then
-      Server(cSetNewModelPicture + (Length(Picture.GrName) + 1 + 16 + 3) div 4,
-        0, 0, Picture)
+      Server(cSetNewModelPicture, 0, 0, Picture)
     else
-      Server(cSetModelPicture + (Length(Picture.GrName) + 1 + 16 + 3) div 4, 0,
-        0, Picture)
+      Server(cSetModelPicture, 0, 0, Picture)
   else
     with Tribe[p].ModelPicture[mix] do
@@ -830 +828 @@
   begin
     result := false;
-    exit
+    exit;
   end;
   with MyRO.EnemyModel[emix] do
@@ -914 +912 @@
         TribeMessage(p1, Tribe[p1].TPhrase('FRNEWNATION'), '');
         MyData.ToldContact := MyData.ToldContact or (1 shl p1);
-      end
+      end;
 end;
 
@@ -963 +961 @@
           ModelNameInfo.mix := MyData.ToldModels;
           ModelNameInfo.NewName := EInput.Text;
-          Server(cSetModelName + (Length(ModelNameInfo.NewName) + 1 + 4 + 3)
-            div 4, me, 0, ModelNameInfo);
+          Server(cSetModelName, me, 0, ModelNameInfo);
         end;
       end;
@@ -1857 +1854 @@
           GrName := 'StdUnits.png';
           Tribe[p1].SetModelPicture(Picture, true);
-        end
+        end;
   end;
 
@@ -2139 +2136 @@
               begin
                 OpenSound := 'MSG_COLDWAR';
-                s := Tribe[MyRO.Wonder[i].EffectiveOwner].TPhrase('COLDWAR')
+                s := Tribe[MyRO.Wonder[i].EffectiveOwner].TPhrase('COLDWAR');
               end
               else if MyRO.Wonder[i].EffectiveOwner >= 0 then
@@ -2145 +2142 @@
                 OpenSound := 'WONDER_BUILT';
                 s := Tribe[MyRO.Wonder[i].EffectiveOwner]
-                  .TPhrase('WONDERBUILT')
+                  .TPhrase('WONDERBUILT');
               end
               else
@@ -2161 +2158 @@
               IconIndex := i;
               ShowModal;
-            end
-        end
+            end;
+        end;
       end
       else if (MyRO.Wonder[i].EffectiveOwner <> MyData.ToldWonders[i]
@@ -2181 +2178 @@
               IconIndex := i;
               ShowModal;
-            end
+            end;
         end
         else if (MyData.ToldWonders[i].EffectiveOwner >= 0) and not OwnWonder
@@ -2203 +2200 @@
     begin
       SoundMessageEx(Phrases.Lookup('COLDWAREND'), 'MSG_DEFAULT');
-      MyData.ColdWarStart := -ColdWarTurns - 1
+      MyData.ColdWarStart := -ColdWarTurns - 1;
     end;
 
@@ -2734 +2731 @@
                 CreateTribe(TribeInfo.trix, TribeInfo.FileName, false)
               else
-                Server(cSetTribe + (Length(TribeInfo.FileName) + 1 + 7) div 4,
-                  0, 0, TribeInfo);
+                Server(cSetTribe, 0, 0, TribeInfo);
             end;
 
@@ -2749 +2745 @@
                 CreateTribe(TribeInfo.trix, TribeInfo.FileName, false)
               else
-                Server(cSetTribe + (Length(TribeInfo.FileName) + 1 + 7) div 4,
-                  0, 0, TribeInfo);
+                Server(cSetTribe, 0, 0, TribeInfo);
             end;
         end;
@@ -3445 +3440 @@
           MainOffscreenPaint;
           Update;
-        end
+        end;
       end;
 
   else
     if Command >= cClientEx then
-      case Command and $FFF0 of
-
+      case Command  of
         cSetTribe:
-          with TTribeInfo(Data) do
-          begin
+          with TTribeInfo(Data) do begin
             i := UnusedTribeFiles.Count - 1;
             while (i >= 0) and
@@ -3463 +3456 @@
             CreateTribe(trix, FileName, true);
           end;
-
-        cSetNewModelPicture, cSetModelPicture:
+        cSetNewModelPicture:
           if TribeOriginal[TModelPictureInfo(Data).trix] then
             Tribe[TModelPictureInfo(Data).trix].SetModelPicture
-              (TModelPictureInfo(Data), Command and
-              $FFF0 = cSetNewModelPicture);
-
-        cSetSlaveIndex and $FFF0:
+              (TModelPictureInfo(Data), True);
+        cSetModelPicture:
+          if TribeOriginal[TModelPictureInfo(Data).trix] then
+            Tribe[TModelPictureInfo(Data).trix].SetModelPicture
+              (TModelPictureInfo(Data), False);
+        cSetSlaveIndex:
           Tribe[integer(Data) shr 16].mixSlaves := integer(Data) and $FFFF;
-
         cSetCityName:
           with TCityNameInfo(Data) do
             if TribeOriginal[ID shr 12] then
               Tribe[ID shr 12].SetCityName(ID and $FFF, NewName);
-
         cSetModelName:
           with TModelNameInfo(Data) do
@@ -5138 +5130 @@
       Brush.Style := bsClear;
       if UnFocus >= 0 then
-        with MyUn[UnFocus] do
-        with MyModel[mix] do
+        with MyUn^[UnFocus] do
+        with MyModel^[mix] do
         begin { display info about selected unit }
           if Job = jCity then