Changeset 364 for trunk/GameServer.pas

Timestamp:

Apr 12, 2021, 11:55:20 PM (3 years ago)

Author:

chronos

Message:

• Added: Partial network game play implementation.
• Modified: Code cleanup.

File:

• trunk/GameServer.pas (modified) (36 diffs)

trunk/GameServer.pas

@@ -49 +49 @@
 var
   // PARAMETERS
-  PlayersBrain: TBrains; { brain of the players }
+  PlayersBrain: TBrains; { brain of the players view }
   Difficulty: array [0 .. nPl - 1] of integer absolute Database.Difficulty;
   { difficulty }
@@ -62 +62 @@
   BrainTerm: TBrain;
   BrainRandom: TBrain;
+  BrainNetworkClient: TBrain;
+  BrainNetworkServer: TBrain;
 
 procedure Init(NotifyFunction: TNotifyFunction);
@@ -147 +149 @@
 {$ELSE}
     try
-      Brain[bix[p]].Client(Command, p, Data);
+      bix[p].Client(Command, p, Data);
     except
       Notify(ntException + bix[p]);
@@ -199 +201 @@
   BrainNoTerm.FileName := ':AIT';
   BrainNoTerm.Flags := 0;
-  BrainNoTerm.Initialized := false;
+  BrainNoTerm.Initialized := False;
   BrainNoTerm.Kind := btNoTerm;
   BrainSuperVirtual := Brains.AddNew;
   BrainSuperVirtual.FileName := ':Supervisor';
   BrainSuperVirtual.Flags := 0;
-  BrainSuperVirtual.Initialized := false;
+  BrainSuperVirtual.Initialized := False;
   BrainSuperVirtual.Kind := btSuperVirtual;
+  BrainNetworkClient := Brains.AddNew;
+  BrainNetworkClient.FileName := ':NetworkClient';
+  BrainNetworkClient.Flags := fMultiple;
+  BrainNetworkClient.Initialized := False;
+  BrainNetworkClient.ServerVersion := Version;
+  BrainNetworkClient.Kind := btNetworkClient;
   BrainTerm := Brains.AddNew;
   BrainTerm.FileName := ':StdIntf';
   BrainTerm.Flags := fMultiple;
-  BrainTerm.Initialized := false;
+  BrainTerm.Initialized := False;
   BrainTerm.ServerVersion := Version;
   BrainTerm.Kind := btTerm;
@@ -215 +223 @@
   BrainRandom.FileName := ':Random';
   BrainRandom.Flags := fMultiple;
-  BrainRandom.Initialized := false;
+  BrainRandom.Initialized := False;
   BrainRandom.Kind := btRandom;
+  BrainNetworkServer := Brains.AddNew;
+  BrainNetworkServer.FileName := ':NetworkServer';
+  BrainNetworkServer.Flags := fMultiple;
+  BrainNetworkServer.Initialized := False;
+  BrainNetworkServer.ServerVersion := Version;
+  BrainNetworkServer.Kind := btNetworkServer;
 
   if FindFirst(GetAiDir + DirectorySeparator + '*', faDirectory or faArchive or faReadOnly, f) = 0 then
@@ -330 +344 @@
     Notify(ntDeactivationMissing, p);
     ForceClientDeactivation;
-  end
+  end;
 end;
 
@@ -2386 +2400 @@
       if PModel.Attack = 0 then
         Flags := Flags and not unBombsLoaded;
-      dec(Movement, 100)
+      dec(Movement, 100);
     end
     else if MoveInfo.MoveType = mtExpel then
@@ -2393 +2407 @@
       Job := jNone;
       Flags := Flags and not unFortified;
-      dec(Movement, 100)
+      dec(Movement, 100);
     end
     else
@@ -2443 +2457 @@
           inc(nUpdateLoc);
           Flags := Flags or unWithdrawn;
-        end
+        end;
       end
     else if (MoveInfo.MoveType = mtAttack) and (MoveInfo.EndHealthDef > 0) then
@@ -2481 +2495 @@
               begin
                 UpdateLoc[nUpdateLoc] := Loc;
-                inc(nUpdateLoc)
+                inc(nUpdateLoc);
               end;
           // unit will be removed -- remember position and update for all players
@@ -2529 +2543 @@
             CallPlayer(cShowUnitChanged, p1, ExpelToLoc);
         end;
-    end
-  end
+    end;
+  end;
 end; // ExecuteAttack
 
@@ -2546 +2560 @@
     begin
       result := eInvalid;
-      exit
+      exit;
     end;
     result := CalculateMove(p, uix, ToLoc, 3 - dy and 1, TestOnly, MoveInfo);
@@ -2580 +2594 @@
           result := ExecuteMove(p, uix, ToLoc, MoveInfo, ShowMove) or result;
         mtAttack, mtBombard, mtExpel:
-          result := ExecuteAttack(p, uix, ToLoc, MoveInfo, ShowMove) or result
-      end;
-    end
+          result := ExecuteAttack(p, uix, ToLoc, MoveInfo, ShowMove) or result;
+      end;
+    end;
   end; // with
 end; { MoveUnit }
@@ -2656 +2670 @@
       result := ptShip
     else
-      result := ptImp
+      result := ptImp;
   end;
 
@@ -2687 +2701 @@
   begin
     result := eUnknown;
-    exit
+    exit;
   end;
 
@@ -2695 +2709 @@
   begin
     result := eInvalid;
-    exit
+    exit;
   end;
 
@@ -2705 +2719 @@
     PutMessage(1 shl 16 + 1, Format('NOT Alive: %d', [Player]));
     result := eNoTurn;
-    exit
+    exit;
   end;
 
@@ -2732 +2746 @@
       [Player, Command shr 4]));
     result := eNoTurn;
-    exit
+    exit;
   end;
 
@@ -2858 +2872 @@
         else
           result := GetTileInfo(Player, TTileInfo(Data).ExplCity, Subject,
-            TTileInfo(Data))
+            TTileInfo(Data));
       end
       else
@@ -2869 +2883 @@
           result := eNoPreq
         else
-          result := GetJobProgress(Player, Subject, TJobProgressData(Data))
+          result := GetJobProgress(Player, Subject, TJobProgressData(Data));
       end
       else
@@ -2918 +2932 @@
             end;
             if result = eOK then
-              result := eInvalid // no enemy unit there!
+              result := eInvalid; // no enemy unit there!
           end
           else
@@ -2949 +2963 @@
           result := eOK
         else
-          result := eNoWay
+          result := eNoWay;
       end;
 
@@ -3001 +3015 @@
         TCityReport(Data).HypoTax := -1;
         TCityReport(Data).HypoLux := -1;
-        GetCityReport(p1, cix1, TCityReport(Data))
+        GetCityReport(p1, cix1, TCityReport(Data));
       end
       else
@@ -3032 +3046 @@
           p1 := 1;
         SearchCity(Subject, p1, cix1);
-        GetCityAreaInfo(p1, Subject, TCityAreaInfo(Data))
+        GetCityAreaInfo(p1, Subject, TCityAreaInfo(Data));
       end
       else
@@ -3096 +3110 @@
               LogChanges;
               SaveGame('~' + LogFileName, true);
-            end
+            end;
 {$ENDIF}
           end
@@ -3125 +3139 @@
           begin
             if CheckSum <> Subject then
-              LoadOK := false
+              LoadOK := false;
           end
           else // save checksum
@@ -3171 +3185 @@
             CCCommand := cTurn;
             CCPlayer := pTurn;
-            Notify(ntNextPlayer)
+            Notify(ntNextPlayer);
           end
           else
@@ -3235 +3249 @@
             sReload:
               LoadGame(SavePath, LogFileName, integer(Data), false);
-          end
+          end;
         end
         else
@@ -3252 +3266 @@
           Notify(ntStartGoRefreshMaps)
         else
-          Notify(ntStartGo)
+          Notify(ntStartGo);
       end
       else
@@ -3292 +3306 @@
           assert(Mode = moPlaying);
           ChangeClientWhenDone(cContinue, pTurn, nil^, 0);
-        end
+        end;
       end
       else
@@ -3309 +3323 @@
           IntServer(sIntHaveContact, pTurn, pContacted, nil^);
           ChangeClientWhenDone(scDipStart, pDipActive, nil^, 0);
-        end
+        end;
       end
       else
@@ -3368 +3382 @@
                     ShowShipChange.Ship2Change[Price[i] shr 16 and 3] :=
                       +integer(Price[i] and $FFFF);
-                  end
+                  end;
                 end;
               if HasShipChanged then
@@ -3382 +3396 @@
                     if 1 shl p2 and GWatching <> 0 then
                       CallPlayer(cShowShipChange, p2, ShowShipChange);
-                  end
-              end
+                  end;
+              end;
             end;
           end
@@ -3408 +3422 @@
                 CallPlayer(cShowCancelTreatyByAlliance, pDipActive, i);
               end;
-          end
+          end;
         end
         else
@@ -3431 +3445 @@
             pDipActive := p1;
             ChangeClientWhenDone(Command, pDipActive, nil^, 0);
-          end
+          end;
       end
       else
@@ -3449 +3463 @@
             assert(Mode = moPlaying);
             ChangeClientWhenDone(cContinue, pTurn, nil^, 0);
-          end
+          end;
         end
         else