Changeset 336 for trunk/GameServer.pas

Timestamp:

Mar 31, 2021, 10:49:44 PM (3 years ago)

Author:

chronos

Message:

• Modify: Change Notify function to have separate enumeration type and integer value. Previously was combined into single integer.
• Fixed: Paint correctly loading progress dialog on Linux.

File:

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

trunk/GameServer.pas

@@ -15 +15 @@
   FirstBookCompatibleVersion = $010103;
 
-  // notifications
-  ntCreateWorld = 0;
-  ntInitModule = $100;
-  ntInitLocalHuman = $1FF;
-  ntDLLError = $200;
-  ntAIError = $2FF;
-  ntClientError = $300;
-  ntInitPlayers = $400;
-  ntDeactivationMissing = $410;
-  ntSetAIName = $420;
-  ntException = $500;
-  ntLoadBegin = $600;
-  ntLoadState = $601;
-  ntEndInfo = $6FC;
-  ntBackOn = $6FD;
-  ntBackOff = $6FE;
-  ntLoadError = $6FF;
-  ntStartDone = $700;
-  ntStartGo = $701;
-  ntStartGoRefresh = $702;
-  ntStartGoRefreshMaps = $703;
-  ntChangeClient = $800;
-  ntNextPlayer = $810;
-  ntDeinitModule = $900;
-
   // module flags
   fMultiple = $10000000;
@@ -48 +23 @@
 
 type
-  TNotifyFunction = procedure(ID: integer);
+  // notifications
+  TNotify = (
+    ntCreateWorld = 0,
+    ntInitModule = $100,
+    ntInitLocalHuman = $1FF,
+    ntDLLError = $200,
+    ntAIError = $2FF,
+    ntClientError = $300,
+    ntInitPlayers = $400,
+    ntDeactivationMissing = $410,
+    ntSetAIName = $420,
+    ntException = $500,
+    ntLoadBegin = $600,
+    ntLoadState = $601,
+    ntEndInfo = $6FC,
+    ntBackOn = $6FD,
+    ntBackOff = $6FE,
+    ntLoadError = $6FF,
+    ntStartDone = $700,
+    ntStartGo = $701,
+    ntStartGoRefresh = $702,
+    ntStartGoRefreshMaps = $703,
+    ntChangeClient = $800,
+    ntNextPlayer = $810,
+    ntDeinitModule = $900
+  );
+
+  TNotifyFunction = procedure(ID: TNotify; Index: Integer = 0);
 
   TBrainType = (btNoTerm, btSuperVirtual, btTerm, btRandom, btAI);
@@ -365 +367 @@
     (CCPlayer < 0) then
   begin
-    Notify(ntDeactivationMissing + p);
+    Notify(ntDeactivationMissing, p);
     ForceClientDeactivation;
   end
@@ -513 +515 @@
     if Kind = btAI then
     begin { get client function }
-      Notify(ntInitModule + Brains.IndexOf(bix));
+      Notify(ntInitModule, Brains.IndexOf(bix));
       if Flags and fDotNet > 0 then
         Client := DotNetClient
@@ -522 +524 @@
         begin
           Client := nil;
-          Notify(ntDLLError + Brains.IndexOf(bix));
+          Notify(ntDLLError, Brains.IndexOf(bix));
         end
         else
@@ -528 +530 @@
           Client := GetProcAddress(hm, 'client');
           if @Client = nil then
-            Notify(ntClientError + Brains.IndexOf(bix));
-        end
-      end
+            Notify(ntClientError, Brains.IndexOf(bix));
+        end;
+      end;
     end;
     if @Client <> nil then
@@ -545 +547 @@
         DataSize := 0;
       Flags := Flags or InitModuleData.Flags;
-    end
-  end
+    end;
+  end;
 end;
 
@@ -730 +732 @@
   if bix[0].Kind <> btNoTerm then
     Notify(ntInitLocalHuman);
+
   BrainUsed := [];
   for p := 0 to nPl - 1 do
@@ -955 +958 @@
         else
           NotifyMessage := '';
-        Notify(ntSetAIName + p1);
-      end
+        Notify(ntSetAIName, p1);
+      end;
   end;
 
@@ -1278 +1281 @@
     end;
     if not MovieMode then
-      Notify(ntLoadState + CL.Progress * 128 div 1000);
+      Notify(ntLoadState, CL.Progress * 128 div 1000);
   end;
 
@@ -3250 +3253 @@
             begin
               if Brains[i].Kind = btAI then
-                Notify(ntDeinitModule + i);
+                Notify(ntDeinitModule, i);
               CallClient(i, cBreakGame, nil^);
             end;