Revert "fixed weapon switching over the network; bumped protocol version"

[d2df-sdl.git] / src / game / g_net.pas

diff --git a/src/game/g_net.pas b/src/game/g_net.pas
index 2c88e6dacf6962d0505bd19f8e4484d55c0e4f74..c15df2bae9406b2cc043fce515bdc11b113b21da 100644 (file)
--- a/src/game/g_net.pas
+++ b/src/game/g_net.pas
@@ -66,6 +66,12 @@ const
   BANLIST_FILENAME = 'banlist.txt';
   NETDUMP_FILENAME = 'netdump';
 
   BANLIST_FILENAME = 'banlist.txt';
   NETDUMP_FILENAME = 'netdump';
 

+  {$IFDEF FREEBSD}
+    NilThreadId = nil;
+  {$ELSE}
+    NilThreadId = 0;
+  {$ENDIF}
+

 type
   TNetClient = record
     ID:      Byte;
 type
   TNetClient = record
     ID:      Byte;


@@ -149,7 +155,7 @@ var
   NetIGDService: TURLStr;
 {$ENDIF}
 
   NetIGDService: TURLStr;
 {$ENDIF}
 

-  NetPortThread: TThreadID = 0;
+  NetPortThread: TThreadID = NilThreadId;

 
   NetDumpFile: TStream;
 
 
   NetDumpFile: TStream;
 


@@ -319,10 +325,10 @@ begin
 
   NetMode := NET_NONE;
 
 
   NetMode := NET_NONE;
 

-  if NetPortThread <> 0 then
+  if NetPortThread <> NilThreadId then

     WaitForThreadTerminate(NetPortThread, 66666);
 
     WaitForThreadTerminate(NetPortThread, 66666);
 

-  NetPortThread := 0;
+  NetPortThread := NilThreadId;

   g_Net_UnforwardPorts();
 
   if NetDump then
   g_Net_UnforwardPorts();
 
   if NetDump then