Changeset 438 for trunk/LocalPlayer/Term.pas

Timestamp:

May 18, 2022, 11:12:29 AM (2 years ago)

Author:

chronos

Message:

• Fixed: Data size was not correctly stored in server commands. Introduced in rev 435.
• Fixed: Check data size for its maximum. Limit maximum length of unit and city name so it can fit into data block.

File:

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

trunk/LocalPlayer/Term.pas

@@ -403 +403 @@
 
 type
+
+  { TTribeInfo }
+
   TTribeInfo = record
     trix: integer;
     FileName: ShortString;
-  end;
+    function GetCommandDataSize: Byte;
+  end;
+
+  { TCityNameInfo }
 
   TCityNameInfo = record
     ID: integer;
     NewName: ShortString;
-  end;
+    function GetCommandDataSize: Byte;
+  end;
+
+  { TModelNameInfo }
 
   TModelNameInfo = record
     mix: integer;
     NewName: ShortString;
+    function GetCommandDataSize: Byte;
   end;
 
@@ -574 +584 @@
   IsControl: boolean = false);
 procedure HelpOnTerrain(Loc: Integer; NewMode: TWindowMode);
+function AlignUp(Value, Alignment: Integer): Integer;
 
 
@@ -581 +592 @@
   Directories, CityScreen, Draft, MessgEx, Select, CityType, Help,
   UnitStat, Log, Diagram, NatStat, Wonders, Enhance, Nego, UPixelPointer, Sound,
-  Battle, Rates, TechTree, Registry, Global, UKeyBindings;
+  Battle, Rates, TechTree, Registry, Global, UKeyBindings, CmdList;
 
 {$R *.lfm}
@@ -760 +771 @@
 end;
 
+function AlignUp(Value, Alignment: Integer): Integer;
+begin
+  Result := Value or (Alignment - 1);
+end;
+
 { *** tribe management procedures *** }
 
@@ -812 +828 @@
       Tribe[p].SetModelPicture(Picture, IsNew)
     else if IsNew then
-      Server(cSetNewModelPicture, 0, 0, Picture)
+      Server(CommandWithData(cSetNewModelPicture, Picture.GetCommandDataSize),
+        0, 0, Picture)
     else
-      Server(cSetModelPicture, 0, 0, Picture)
+      Server(CommandWithData(cSetModelPicture, Picture.GetCommandDataSize),
+        0, 0, Picture)
   else
     with Tribe[p].ModelPicture[mix] do
@@ -961 +979 @@
           ModelNameInfo.mix := MyData.ToldModels;
           ModelNameInfo.NewName := EInput.Text;
-          Server(cSetModelName, me, 0, ModelNameInfo);
+          if ModelNameInfo.GetCommandDataSize > CommandDataMaxSize then
+            Delete(ModelNameInfo.NewName, Length(ModelNameInfo.NewName) -
+             (ModelNameInfo.GetCommandDataSize - 1 - CommandDataMaxSize), MaxInt);
+          Server(CommandWithData(cSetModelName, ModelNameInfo.GetCommandDataSize),
+            me, 0, ModelNameInfo);
         end;
       end;
@@ -972 +994 @@
       inc(MyData.ToldModels);
     end;
+end;
+
+{ TTribeInfo }
+
+function TTribeInfo.GetCommandDataSize: Byte;
+begin
+  Result := SizeOf(trix) + 1 + Length(FileName)
+end;
+
+{ TModelNameInfo }
+
+function TModelNameInfo.GetCommandDataSize: Byte;
+begin
+  Result := SizeOf(mix) + 1 + Length(NewName);
+end;
+
+{ TCityNameInfo }
+
+function TCityNameInfo.GetCommandDataSize: Byte;
+begin
+  Result := SizeOf(ID) + 1 + Length(NewName);
 end;
 
@@ -2731 +2774 @@
                 CreateTribe(TribeInfo.trix, TribeInfo.FileName, false)
               else
-                Server(cSetTribe, 0, 0, TribeInfo);
+                Server(CommandWithData(cSetTribe, TribeInfo.GetCommandDataSize),
+                  0, 0, TribeInfo);
             end;
 
@@ -2745 +2789 @@
                 CreateTribe(TribeInfo.trix, TribeInfo.FileName, false)
               else
-                Server(cSetTribe, 0, 0, TribeInfo);
+                Server(CommandWithData(cSetTribe, TribeInfo.GetCommandDataSize),
+                  0, 0, TribeInfo);
             end;
         end;
@@ -3445 +3490 @@
   else
     if Command >= cClientEx then
-      case Command  of
+      case Command and (not Integer(CommandDataElementCountMask)) of
         cSetTribe:
           with TTribeInfo(Data) do begin