Changeset 438 for trunk/LocalPlayer/Select.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/Select.pas (modified) (5 diffs)

trunk/LocalPlayer/Select.pas

@@ -5 +5 @@
 
 uses
-  Protocol, ClientTools, Term, ScreenTools, IsoEngine, PVSB, BaseWin,
+  Protocol, ClientTools, Term, ScreenTools, PVSB, BaseWin,
   LCLIntf, LCLType, Messages, SysUtils, Classes, Graphics, Controls, Forms,
   ExtCtrls, ButtonB, ButtonBase, Menus, Types;
@@ -99 +99 @@
 
 uses
-  CityScreen, Help, UnitStat, Tribes, Inp;
+  CityScreen, Help, UnitStat, Tribes, Inp, CmdList;
 
 {$R *.lfm}
@@ -865 +865 @@
     CityNameInfo.ID := MyCity[cix].ID;
     CityNameInfo.NewName := InputDlg.EInput.Text;
-    Server(cSetCityName, me, 0, CityNameInfo);
+    if CityNameInfo.GetCommandDataSize > CommandDataMaxSize then
+      Delete(CityNameInfo.NewName, Length(CityNameInfo.NewName) -
+        (CityNameInfo.GetCommandDataSize - 1 - CommandDataMaxSize), MaxInt);
+    Server(CommandWithData(cSetCityName, CityNameInfo.GetCommandDataSize),
+      me, 0, CityNameInfo);
     if CityDlg.Visible then
     begin
@@ -871 +875 @@
       CityDlg.Invalidate;
     end;
-    result := true;
+    Result := True;
   end
   else
-    result := false;
+    Result := False;
 end;
 
@@ -890 +894 @@
     ModelNameInfo.mix := mix;
     ModelNameInfo.NewName := InputDlg.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);
     if UnitStatDlg.Visible then
     begin