net module

linuxdoom-1.10/doomstat.h

@@ -28,7 +28,6 @@
 
 // We need globally shared data structures,
 //  for defining the global state variables.
-#include "d_net.h"
 #include "doomdata.h"
 
 // We need the playr data structure as well.
@@ -181,19 +180,3 @@ extern int bodyqueslot;
 //  as well as tracking projectiles etc.
 extern int skyflatnum;
 
-// Netgame stuff (buffers and pointers, i.e. indices).
-
-// This is ???
-extern doomcom_t *doomcom;
-
-// This points inside doomcom.
-extern doomdata_t *netbuffer;
-
-extern ticcmd_t localcmds[BACKUPTICS];
-extern int rndindex;
-
-extern int maketic;
-extern int nettics[MAXNETNODES];
-
-extern ticcmd_t netcmds[MAXPLAYERS][BACKUPTICS];
-extern int ticdup;

linuxdoom-1.10/g_game.cpp

@@ -48,6 +48,7 @@ import menu;
 import argv;
 import wad;
 import am_map;
+import net;
 
 #include "p_local.h"
 
@@ -624,8 +625,9 @@ void G_Ticker(void) {
         }
         if (players[i].mo)
           consistancy[i][buf] = players[i].mo->x;
-        else
-          consistancy[i][buf] = rndindex;
+        //else 
+          // TODO JOONNY rndindex needs to be visible here
+          //consistancy[i][buf] = rndindex;
       }
     }
   }

linuxdoom-1.10/i_net.cpp

@@ -26,13 +26,13 @@
 #include <string>
 
 #include "d_event.h"
-#include "d_net.h"
 
 #include "doomstat.h"
 #include "i_net.h"
 
 import system;
 import argv;
+import net;
 
 // For some odd reason...
 #ifndef ntohl

linuxdoom-1.10/r_main.cpp

@@ -26,7 +26,6 @@
 #include <math.h>
 #include <stdlib.h>
 
-#include "d_net.h"
 #include "doomdef.h"
 
 #include "m_bbox.h"
@@ -35,6 +34,7 @@
 #include "r_sky.h"
 
 import system;
+import net;
 
 // Fineangles in the SCREENWIDTH wide window.
 #define FIELDOFVIEW 2048

src/main.ixx

@@ -21,7 +21,6 @@
 //-----------------------------------------------------------------------------
 module;
 
-#include "d_net.h"
 #include "doomdef.h"
 
 #include "dstrings.h"
@@ -59,6 +58,7 @@ import menu;
 import wad;
 import argv;
 import am_map;
+import net;
 
 // List of wad files
 std::vector<std::string> wadfilenames;