Changeset 355 for trunk

Timestamp:

Apr 7, 2021, 4:25:54 PM (4 years ago)

Author:

chronos

Message:

• Modified: Code cleanup.

Location:

trunk

Files:

• CmdList.pas (modified) (15 diffs)
• GameServer.pas (modified) (1 diff)
• Packages/CevoComponents/ButtonBase.pas (modified) (2 diffs)

trunk/CmdList.pas

@@ -14 +14 @@
 
   TCmdListState = record
-    nLog, { used size of LogData in bytes }
-    LoadPos, { position in LogData when loading a game }
-    LastMovingUnit: integer;
-    MoveCode, LoadMoveCode: Cardinal;
+    nLog: Integer; { used size of LogData in bytes }
+    LoadPos: Integer; { position in LogData when loading a game }
+    LastMovingUnit: Integer;
+    MoveCode: Cardinal;
+    LoadMoveCode: Cardinal;
   end;
 
@@ -72 +73 @@
 end;
 
-procedure TCmdList.Get(var Command, Player, Subject: integer;
-  var Data: pointer);
+procedure TCmdList.Get(var Command, Player, Subject: integer; var Data: pointer);
 var
-  DirCode, code: Cardinal;
+  DirCode: Cardinal;
+  Code: Cardinal;
 begin
   if FState.LoadMoveCode > 0 then
@@ -94 +95 @@
     end;
     case DirCode of
-      0:
-        Command := sMoveUnit + $090;
-      1:
-        Command := sMoveUnit + $0F0;
-      2:
-        Command := sMoveUnit + $390;
-      3:
-        Command := sMoveUnit + $3F0;
-      4:
-        Command := sMoveUnit + $020;
-      5:
-        Command := sMoveUnit + $060;
-      6:
-        Command := sMoveUnit + $100;
-      7:
-        Command := sMoveUnit + $300;
+      0: Command := sMoveUnit + $090;
+      1: Command := sMoveUnit + $0F0;
+      2: Command := sMoveUnit + $390;
+      3: Command := sMoveUnit + $3F0;
+      4: Command := sMoveUnit + $020;
+      5: Command := sMoveUnit + $060;
+      6: Command := sMoveUnit + $100;
+      7: Command := sMoveUnit + $300;
     end;
     Data := nil;
@@ -135 +128 @@
       begin
         FState.LoadMoveCode := code and $FF;
-        inc(FState.LoadPos)
+        inc(FState.LoadPos);
       end
       else
@@ -143 +136 @@
       end;
       Get(Command, Player, Subject, Data);
-      exit;
+      Exit;
     end;
 
@@ -152 +145 @@
       Data := @LogData[FState.LoadPos];
       inc(FState.LoadPos, Command and $F * 4);
-    end
-  end
+    end;
+  end;
 end;
 
@@ -164 +157 @@
   inc(FState.LoadPos, 4);
   b0 := 0;
-  while Map0 > 0 do
-  begin
-    if Map0 and 1 <> 0 then
-    begin
+  while Map0 > 0 do begin
+    if Map0 and 1 <> 0 then begin
       Map1 := Cardinal((@LogData[FState.LoadPos])^);
       inc(FState.LoadPos, 4);
       for b1 := 0 to 31 do
-        if 1 shl b1 and Map1 <> 0 then
-        begin
+        if 1 shl b1 and Map1 <> 0 then begin
           if b0 * 32 + b1 < DataSize then
             PData(Data)[b0 * 32 + b1] := Cardinal((@LogData[FState.LoadPos])^);
@@ -180 +170 @@
     inc(b0);
     Map0 := Map0 shr 1;
-  end
+  end;
 end;
 
@@ -190 +180 @@
   begin // move command shortcut
     case Command of
-      sMoveUnit + $090:
-        DirCode := 0;
-      sMoveUnit + $0F0:
-        DirCode := 1;
-      sMoveUnit + $390:
-        DirCode := 2;
-      sMoveUnit + $3F0:
-        DirCode := 3;
-      sMoveUnit + $020:
-        DirCode := 4;
-      sMoveUnit + $060:
-        DirCode := 5;
-      sMoveUnit + $100:
-        DirCode := 6;
-      sMoveUnit + $300:
-        DirCode := 7;
+      sMoveUnit + $090: DirCode := 0;
+      sMoveUnit + $0F0: DirCode := 1;
+      sMoveUnit + $390: DirCode := 2;
+      sMoveUnit + $3F0: DirCode := 3;
+      sMoveUnit + $020: DirCode := 4;
+      sMoveUnit + $060: DirCode := 5;
+      sMoveUnit + $100: DirCode := 6;
+      sMoveUnit + $300: DirCode := 7;
     end;
     if Subject = FState.LastMovingUnit then
@@ -231 +213 @@
     begin
       PutData(@FState.MoveCode, 3);
-      FState.MoveCode := code
+      FState.MoveCode := code;
     end;
     FState.LastMovingUnit := Subject;
@@ -306 +288 @@
   code := Cardinal(Command - sExecute) shl 2 + Cardinal(Player) shl 16;
   Cardinal((@LogData[FState.nLog])^) := code;
-  FState.nLog := MapPos
+  FState.nLog := MapPos;
 end;
 
@@ -329 +311 @@
       PutData(@FState.MoveCode, 3); // Single M
     FState.MoveCode := 0;
-  end
+  end;
 end;
 
@@ -346 +328 @@
   CompleteMoveCode;
   f.write(FState.nLog, 4);
-  f.write(LogData^, FState.nLog)
+  f.write(LogData^, FState.nLog);
 end;
 
@@ -355 +337 @@
   f.write(FState.nLog, 4);
   f.Position := f.Position + OldState.nLog;
-  f.write(LogData[OldState.nLog], FState.nLog - OldState.nLog)
+  f.write(LogData[OldState.nLog], FState.nLog - OldState.nLog);
 end;
 
@@ -370 +352 @@
     result := (FState.LoadPos shr 8) * 999 div (FState.nLog shr 8)
   else
-    result := FState.LoadPos * 999 div FState.nLog
+    result := FState.LoadPos * 999 div FState.nLog;
 end;
 

trunk/GameServer.pas

@@ -148 +148 @@
   CCData: array [0 .. 14] of integer;
   bix: TBrains; { brain of the players }
-  DevModelTurn, { turn of last call to sResetModel }
-  OriginalDataVersion: array [0 .. nPl - 1] of integer;
+  DevModelTurn: array [0 .. nPl - 1] of Integer; { turn of last call to sResetModel }
+  OriginalDataVersion: array [0 .. nPl - 1] of Integer;
   SavedTiles { , SavedResourceWeights } : array [0 .. ncmax - 1] of Cardinal;
   SavedData: array [0 .. nPl - 1] of pointer;

trunk/Packages/CevoComponents/ButtonBase.pas

@@ -80 +80 @@
     end;
     if (Button = mbLeft) and (@ClickProc <> nil) then
-      ClickProc(self)
+      ClickProc(self);
   end
   else
@@ -116 +116 @@
       if @DownChangedProc <> nil then
         DownChangedProc(self);
-    end
+    end;
 end;