diff --git a/Android.mk b/Android.mk
index 759f85e35..521a38740 100644
--- a/Android.mk
+++ b/Android.mk
@@ -107,7 +107,7 @@ GAME_SRC = \
source/duke3d/src/input.cpp \
source/duke3d/src/menus.cpp \
source/duke3d/src/namesdyn.cpp \
- source/duke3d/src/net.cpp \
+ source/duke3d/src/network.cpp \
source/duke3d/src/player.cpp \
source/duke3d/src/premap.cpp \
source/duke3d/src/savegame.cpp \
diff --git a/GNUmakefile b/GNUmakefile
index c0e9af3d1..96708b380 100644
--- a/GNUmakefile
+++ b/GNUmakefile
@@ -540,7 +540,7 @@ duke3d_game_objs := \
input.cpp \
menus.cpp \
namesdyn.cpp \
- net.cpp \
+ network.cpp \
savegame.cpp \
rts.cpp \
osdfuncs.cpp \
@@ -758,7 +758,7 @@ sw_game_objs := \
menus.cpp \
miscactr.cpp \
morph.cpp \
- net.cpp \
+ network.cpp \
ninja.cpp \
panel.cpp \
player.cpp \
diff --git a/platform/Apple/EDuke32.xcodeproj/project.pbxproj b/platform/Apple/EDuke32.xcodeproj/project.pbxproj
index 312b16323..57be11c0e 100644
--- a/platform/Apple/EDuke32.xcodeproj/project.pbxproj
+++ b/platform/Apple/EDuke32.xcodeproj/project.pbxproj
@@ -141,7 +141,7 @@
0008E9F319F1AD9B0091588D /* input.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0008E9BE19F1AD9B0091588D /* input.cpp */; };
0008E9F419F1AD9B0091588D /* menus.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0008E9C219F1AD9B0091588D /* menus.cpp */; };
0008E9F519F1AD9B0091588D /* namesdyn.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0008E9C519F1AD9B0091588D /* namesdyn.cpp */; };
- 0008E9F619F1AD9B0091588D /* net.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0008E9C719F1AD9B0091588D /* net.cpp */; };
+ 0008E9F619F1AD9B0091588D /* network.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0008E9C719F1AD9B0091588D /* network.cpp */; };
0008E9F719F1AD9B0091588D /* osdcmds.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0008E9C919F1AD9B0091588D /* osdcmds.cpp */; };
0008E9F819F1AD9B0091588D /* osdfuncs.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0008E9CB19F1AD9B0091588D /* osdfuncs.cpp */; };
0008E9F919F1AD9B0091588D /* player.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0008E9CD19F1AD9B0091588D /* player.cpp */; };
@@ -217,7 +217,7 @@
000C48A619F35601006E6B52 /* input.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0008E9BE19F1AD9B0091588D /* input.cpp */; };
000C48A719F35601006E6B52 /* menus.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0008E9C219F1AD9B0091588D /* menus.cpp */; };
000C48A819F35601006E6B52 /* namesdyn.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0008E9C519F1AD9B0091588D /* namesdyn.cpp */; };
- 000C48A919F35601006E6B52 /* net.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0008E9C719F1AD9B0091588D /* net.cpp */; };
+ 000C48A919F35601006E6B52 /* network.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0008E9C719F1AD9B0091588D /* network.cpp */; };
000C48AA19F35601006E6B52 /* osdcmds.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0008E9C919F1AD9B0091588D /* osdcmds.cpp */; };
000C48AB19F35601006E6B52 /* osdfuncs.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0008E9CB19F1AD9B0091588D /* osdfuncs.cpp */; };
000C48AC19F35601006E6B52 /* player.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0008E9CD19F1AD9B0091588D /* player.cpp */; };
@@ -682,8 +682,8 @@
0008E9C419F1AD9B0091588D /* names.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = names.h; path = ../../source/duke3d/src/names.h; sourceTree = SOURCE_ROOT; };
0008E9C519F1AD9B0091588D /* namesdyn.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.c; name = namesdyn.cpp; path = ../../source/duke3d/src/namesdyn.cpp; sourceTree = SOURCE_ROOT; };
0008E9C619F1AD9B0091588D /* namesdyn.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = namesdyn.h; path = ../../source/duke3d/src/namesdyn.h; sourceTree = SOURCE_ROOT; };
- 0008E9C719F1AD9B0091588D /* net.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.c; name = net.cpp; path = ../../source/duke3d/src/net.cpp; sourceTree = SOURCE_ROOT; };
- 0008E9C819F1AD9B0091588D /* net.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = net.h; path = ../../source/duke3d/src/net.h; sourceTree = SOURCE_ROOT; };
+ 0008E9C719F1AD9B0091588D /* network.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.c; name = network.cpp; path = ../../source/duke3d/src/network.cpp; sourceTree = SOURCE_ROOT; };
+ 0008E9C819F1AD9B0091588D /* network.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = network.h; path = ../../source/duke3d/src/network.h; sourceTree = SOURCE_ROOT; };
0008E9C919F1AD9B0091588D /* osdcmds.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.c; name = osdcmds.cpp; path = ../../source/duke3d/src/osdcmds.cpp; sourceTree = SOURCE_ROOT; };
0008E9CA19F1AD9B0091588D /* osdcmds.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = osdcmds.h; path = ../../source/duke3d/src/osdcmds.h; sourceTree = SOURCE_ROOT; };
0008E9CB19F1AD9B0091588D /* osdfuncs.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.c; name = osdfuncs.cpp; path = ../../source/duke3d/src/osdfuncs.cpp; sourceTree = SOURCE_ROOT; };
@@ -1102,8 +1102,8 @@
0008E9C419F1AD9B0091588D /* names.h */,
0008E9C519F1AD9B0091588D /* namesdyn.cpp */,
0008E9C619F1AD9B0091588D /* namesdyn.h */,
- 0008E9C719F1AD9B0091588D /* net.cpp */,
- 0008E9C819F1AD9B0091588D /* net.h */,
+ 0008E9C719F1AD9B0091588D /* network.cpp */,
+ 0008E9C819F1AD9B0091588D /* network.h */,
0008E9C919F1AD9B0091588D /* osdcmds.cpp */,
0008E9CA19F1AD9B0091588D /* osdcmds.h */,
0008E9CB19F1AD9B0091588D /* osdfuncs.cpp */,
@@ -1934,7 +1934,7 @@
0008E9EA19F1AD9B0091588D /* game.cpp in Sources */,
0008EA0719F1ADC90091588D /* common.cpp in Sources */,
0008E9E619F1AD9B0091588D /* animvpx.cpp in Sources */,
- 0008E9F619F1AD9B0091588D /* net.cpp in Sources */,
+ 0008E9F619F1AD9B0091588D /* network.cpp in Sources */,
0008E9F219F1AD9B0091588D /* grpscan.cpp in Sources */,
0008EA0119F1AD9B0091588D /* sounds.cpp in Sources */,
0008E9E419F1AD9B0091588D /* actors.cpp in Sources */,
@@ -2099,7 +2099,7 @@
000C489D19F35601006E6B52 /* demo.cpp in Sources */,
20F712561C6C1A07006B68D0 /* cheats.cpp in Sources */,
000C48A719F35601006E6B52 /* menus.cpp in Sources */,
- 000C48A919F35601006E6B52 /* net.cpp in Sources */,
+ 000C48A919F35601006E6B52 /* network.cpp in Sources */,
000C48A819F35601006E6B52 /* namesdyn.cpp in Sources */,
000C48B219F35601006E6B52 /* sector.cpp in Sources */,
000C48AA19F35601006E6B52 /* osdcmds.cpp in Sources */,
diff --git a/platform/Windows/eduke32.vcxproj b/platform/Windows/eduke32.vcxproj
index 8c7fc2e9e..d01914666 100644
--- a/platform/Windows/eduke32.vcxproj
+++ b/platform/Windows/eduke32.vcxproj
@@ -185,7 +185,7 @@
-
+
@@ -244,7 +244,7 @@
-
+
diff --git a/platform/Windows/eduke32.vcxproj.filters b/platform/Windows/eduke32.vcxproj.filters
index 4fcbf55f4..4e9ad0368 100644
--- a/platform/Windows/eduke32.vcxproj.filters
+++ b/platform/Windows/eduke32.vcxproj.filters
@@ -90,7 +90,7 @@
Header Files
-
+
Header Files
@@ -245,7 +245,7 @@
Source Files
-
+
Source Files
diff --git a/platform/Windows/msvc.mak b/platform/Windows/msvc.mak
index b4a37992d..8aaf4c48c 100644
--- a/platform/Windows/msvc.mak
+++ b/platform/Windows/msvc.mak
@@ -277,7 +277,7 @@ DUKE3D_OBJS=$(DUKE3D_OBJ)\game.$o \
$(DUKE3D_OBJ)\input.$o \
$(DUKE3D_OBJ)\menus.$o \
$(DUKE3D_OBJ)\namesdyn.$o \
- $(DUKE3D_OBJ)\net.$o \
+ $(DUKE3D_OBJ)\network.$o \
$(DUKE3D_OBJ)\player.$o \
$(DUKE3D_OBJ)\premap.$o \
$(DUKE3D_OBJ)\savegame.$o \
diff --git a/source/duke3d/Dependencies.mak b/source/duke3d/Dependencies.mak
index 821d4b41d..1ece291b9 100644
--- a/source/duke3d/Dependencies.mak
+++ b/source/duke3d/Dependencies.mak
@@ -50,7 +50,7 @@ $(duke3d_obj)/input.$o: $(duke3d_src)/input.cpp $(duke3d_h) $(duke3d_src)/input.
$(duke3d_obj)/mdump.$o: $(duke3d_src)/mdump.cpp $(duke3d_src)/mdump.h
$(duke3d_obj)/menus.$o: $(duke3d_src)/menus.cpp $(duke3d_h) $(duke3d_src)/input.h $(mact_inc)/mouse.h $(duke3d_src)/menus.h
$(duke3d_obj)/namesdyn.$o: $(duke3d_src)/namesdyn.cpp $(duke3d_h)
-$(duke3d_obj)/net.$o: $(duke3d_src)/net.cpp $(duke3d_h)
+$(duke3d_obj)/network.$o: $(duke3d_src)/network.cpp $(duke3d_h)
$(duke3d_obj)/player.$o: $(duke3d_src)/player.cpp $(duke3d_h)
$(duke3d_obj)/premap.$o: $(duke3d_src)/premap.cpp $(duke3d_h) $(engine_inc)/osd.h
$(duke3d_obj)/savegame.$o: $(duke3d_src)/savegame.cpp $(duke3d_h) $(duke3d_src)/savegame.h
diff --git a/source/duke3d/src/duke3d.h b/source/duke3d/src/duke3d.h
index c970d75d4..26e845b95 100644
--- a/source/duke3d/src/duke3d.h
+++ b/source/duke3d/src/duke3d.h
@@ -140,7 +140,7 @@ EDUKE32_STATIC_ASSERT(7 <= MAXTILES-MAXUSERTILES);
#include "macros.h"
#include "music.h"
#include "namesdyn.h"
-#include "net.h"
+#include "network.h"
#include "player.h"
#include "quotes.h"
#include "rts.h"
diff --git a/source/duke3d/src/game.cpp b/source/duke3d/src/game.cpp
index 909bee1cb..972e0e10d 100644
--- a/source/duke3d/src/game.cpp
+++ b/source/duke3d/src/game.cpp
@@ -28,7 +28,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
#include "osdfuncs.h"
#include "osdcmds.h"
#include "crc32.h"
-#include "net.h"
+#include "network.h"
#include "menus.h"
#include "savegame.h"
#include "anim.h"
diff --git a/source/duke3d/src/game.h b/source/duke3d/src/game.h
index 510c72113..475dd8cd7 100644
--- a/source/duke3d/src/game.h
+++ b/source/duke3d/src/game.h
@@ -32,7 +32,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
#include "fix16.h"
#include "gamedefs.h"
#include "gamevars.h"
-#include "net.h"
+#include "network.h"
#ifdef __cplusplus
extern "C" {
diff --git a/source/duke3d/src/net.cpp b/source/duke3d/src/network.cpp
similarity index 99%
rename from source/duke3d/src/net.cpp
rename to source/duke3d/src/network.cpp
index c7502b3ea..08ff5963e 100644
--- a/source/duke3d/src/net.cpp
+++ b/source/duke3d/src/network.cpp
@@ -30,7 +30,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
#include "duke3d.h"
#include "game.h"
#include "gamedef.h"
-#include "net.h"
+#include "network.h"
#include "premap.h"
#include "savegame.h"
#include "input.h"
@@ -62,7 +62,7 @@ int32_t g_networkMode = NET_CLIENT;
typedef TYPE_PUNNED int32_t NetChunk32;
-// Unfortunately faketimerhandler needs extra "help" because the Build Engine source doesn't include net.h.
+// Unfortunately faketimerhandler needs extra "help" because the Build Engine source doesn't include network.h.
#ifdef NETCODE_DISABLE
void faketimerhandler(void)
{
@@ -2679,7 +2679,7 @@ static void Net_ResetPlayerReady()
#define IndexesOK (MAXWALLS < NetNumberOfIndexes) && (MAXSPRITES < NetNumberOfIndexes) && (MAXSECTORS < NetNumberOfIndexes)
#if(!IndexesOK)
-#error "net.c: game arrays are now too big to send over the network, please update NETINDEX_BITS to be the right length to store a wall, sprite, and sector index"
+#error "network.cpp: game arrays are now too big to send over the network, please update NETINDEX_BITS to be the right length to store a wall, sprite, and sector index"
#endif
#define STRUCTINDEX_BITS 8 // hopefully no game structs ever have more than 255 fields....
diff --git a/source/duke3d/src/net.h b/source/duke3d/src/network.h
similarity index 100%
rename from source/duke3d/src/net.h
rename to source/duke3d/src/network.h
diff --git a/source/sw/Dependencies.mak b/source/sw/Dependencies.mak
index 4e3413f99..79a8b406a 100644
--- a/source/sw/Dependencies.mak
+++ b/source/sw/Dependencies.mak
@@ -5,75 +5,75 @@ game_h=$(sw_src)/game.h $(sw_src)/mytypes.h $(mact_inc)/keyboard.h $(sw_src)/sou
tags_h=$(sw_src)/tags.h $(sw_src)/jtags.h
$(sw_obj)/actor.$o: $(sw_src)/actor.cpp $(build_h) $(sw_src)/keys.h $(names2_h) $(panel_h) $(game_h) $(tags_h) $(sw_src)/weapon.h $(sw_src)/sprite.h $(sw_src)/actor.h $(sw_src)/saveable.h
-$(sw_obj)/ai.$o: $(sw_src)/ai.cpp $(build_h) $(sw_src)/keys.h $(names2_h) $(game_h) $(tags_h) $(sw_src)/ninja.h $(sw_src)/ai.h $(sw_src)/sector.h $(sw_src)/sprite.h $(sw_src)/net.h $(sw_src)/saveable.h
-$(sw_obj)/anim.$o: $(sw_src)/anim.cpp $(build_h) $(sw_src)/keys.h $(sw_src)/mytypes.h $(audiolib_inc)/fx_man.h $(audiolib_inc)/music.h $(mact_inc)/scriplib.h $(sw_src)/gamedefs.h $(mact_inc)/keyboard.h $(mact_inc)/control.h $(sw_src)/config.h $(sw_src)/sounds.h $(sw_src)/function.h $(mact_inc)/animlib.h $(sw_src)/anim.h $(game_h) $(sw_src)/colormap.h $(sw_src)/net.h
-$(sw_obj)/border.$o: $(sw_src)/border.cpp $(build_h) $(sw_src)/keys.h $(names2_h) $(panel_h) $(sw_src)/lists.h $(game_h) $(sw_src)/net.h $(sw_src)/text.h
+$(sw_obj)/ai.$o: $(sw_src)/ai.cpp $(build_h) $(sw_src)/keys.h $(names2_h) $(game_h) $(tags_h) $(sw_src)/ninja.h $(sw_src)/ai.h $(sw_src)/sector.h $(sw_src)/sprite.h $(sw_src)/network.h $(sw_src)/saveable.h
+$(sw_obj)/anim.$o: $(sw_src)/anim.cpp $(build_h) $(sw_src)/keys.h $(sw_src)/mytypes.h $(audiolib_inc)/fx_man.h $(audiolib_inc)/music.h $(mact_inc)/scriplib.h $(sw_src)/gamedefs.h $(mact_inc)/keyboard.h $(mact_inc)/control.h $(sw_src)/config.h $(sw_src)/sounds.h $(sw_src)/function.h $(mact_inc)/animlib.h $(sw_src)/anim.h $(game_h) $(sw_src)/colormap.h $(sw_src)/network.h
+$(sw_obj)/border.$o: $(sw_src)/border.cpp $(build_h) $(sw_src)/keys.h $(names2_h) $(panel_h) $(sw_src)/lists.h $(game_h) $(sw_src)/network.h $(sw_src)/text.h
$(sw_obj)/break.$o: $(sw_src)/break.cpp $(build_h) $(sw_src)/keys.h $(names2_h) $(panel_h) $(game_h) $(tags_h) $(sw_src)/break.h $(sw_src)/sprite.h $(sw_src)/sector.h $(sw_src)/light.h $(sw_src)/weapon.h
$(sw_obj)/bunny.$o: $(sw_src)/bunny.cpp $(build_h) $(sw_src)/keys.h $(names2_h) $(panel_h) $(game_h) $(tags_h) $(sw_src)/ai.h $(sw_src)/pal.h $(sw_src)/sprite.h $(sw_src)/actor.h $(sw_src)/weapon.h $(sw_src)/track.h $(sw_src)/saveable.h
-$(sw_obj)/cache.$o: $(sw_src)/cache.cpp $(build_h) $(names2_h) $(game_h) $(tags_h) $(sw_src)/break.h $(sw_src)/quake.h $(sw_src)/pal.h $(sw_src)/cache.h $(sw_src)/sounds.h $(sw_src)/net.h
-$(sw_obj)/cd.$o: $(sw_src)/cd.cpp $(sw_src)/mytypes.h $(sw_src)/keys.h $(names2_h) $(panel_h) $(game_h) $(tags_h) $(sw_src)/player.h $(sw_src)/lists.h $(sw_src)/warp.h $(sw_src)/quake.h $(sw_src)/function.h $(mact_inc)/control.h $(sw_src)/trigger.h $(sw_src)/savedef.h $(sw_src)/menus.h $(sw_src)/net.h $(sw_src)/pal.h
+$(sw_obj)/cache.$o: $(sw_src)/cache.cpp $(build_h) $(names2_h) $(game_h) $(tags_h) $(sw_src)/break.h $(sw_src)/quake.h $(sw_src)/pal.h $(sw_src)/cache.h $(sw_src)/sounds.h $(sw_src)/network.h
+$(sw_obj)/cd.$o: $(sw_src)/cd.cpp $(sw_src)/mytypes.h $(sw_src)/keys.h $(names2_h) $(panel_h) $(game_h) $(tags_h) $(sw_src)/player.h $(sw_src)/lists.h $(sw_src)/warp.h $(sw_src)/quake.h $(sw_src)/function.h $(mact_inc)/control.h $(sw_src)/trigger.h $(sw_src)/savedef.h $(sw_src)/menus.h $(sw_src)/network.h $(sw_src)/pal.h
$(sw_obj)/cheats.$o: $(sw_src)/cheats.cpp $(build_h) $(sw_src)/keys.h $(names2_h) $(panel_h) $(game_h) $(sw_src)/mytypes.h $(mact_inc)/control.h $(sw_src)/function.h $(sw_src)/text.h
$(sw_obj)/colormap.$o: $(sw_src)/colormap.cpp $(build_h) $(sw_src)/keys.h $(sw_src)/pal.h $(game_h)
$(sw_obj)/config.$o: $(sw_src)/config.cpp $(build_h) $(sw_src)/settings.h $(sw_src)/mytypes.h $(mact_inc)/scriplib.h $(sw_src)/gamedefs.h $(mact_inc)/keyboard.h $(sw_src)/function.h $(mact_inc)/control.h $(audiolib_inc)/fx_man.h $(sw_src)/sounds.h $(sw_src)/config.h $(sw_src)/common_game.h $(sw_src)/_functio.h $(sw_src)/_config.h
-$(sw_obj)/console.$o: $(sw_src)/console.cpp $(build_h) $(sw_src)/mytypes.h $(sw_src)/keys.h $(names2_h) $(panel_h) $(game_h) $(tags_h) $(sw_src)/player.h $(sw_src)/lists.h $(sw_src)/warp.h $(sw_src)/quake.h $(sw_src)/function.h $(mact_inc)/control.h $(sw_src)/trigger.h $(sw_src)/savedef.h $(sw_src)/menus.h $(sw_src)/net.h $(sw_src)/pal.h $(sw_src)/weapon.h $(sw_src)/text.h $(sw_src)/jsector.h
+$(sw_obj)/console.$o: $(sw_src)/console.cpp $(build_h) $(sw_src)/mytypes.h $(sw_src)/keys.h $(names2_h) $(panel_h) $(game_h) $(tags_h) $(sw_src)/player.h $(sw_src)/lists.h $(sw_src)/warp.h $(sw_src)/quake.h $(sw_src)/function.h $(mact_inc)/control.h $(sw_src)/trigger.h $(sw_src)/savedef.h $(sw_src)/menus.h $(sw_src)/network.h $(sw_src)/pal.h $(sw_src)/weapon.h $(sw_src)/text.h $(sw_src)/jsector.h
$(sw_obj)/coolg.$o: $(sw_src)/coolg.cpp $(build_h) $(sw_src)/keys.h $(names2_h) $(game_h) $(tags_h) $(sw_src)/ai.h $(sw_src)/sprite.h $(sw_src)/actor.h $(sw_src)/weapon.h $(sw_src)/track.h $(sw_src)/saveable.h
$(sw_obj)/coolie.$o: $(sw_src)/coolie.cpp $(build_h) $(sw_src)/keys.h $(names2_h) $(panel_h) $(game_h) $(tags_h) $(sw_src)/ai.h $(sw_src)/sprite.h $(sw_src)/actor.h $(sw_src)/track.h $(sw_src)/weapon.h $(sw_src)/saveable.h
$(sw_obj)/copysect.$o: $(sw_src)/copysect.cpp $(build_h) $(names2_h) $(game_h) $(tags_h) $(sw_src)/weapon.h $(sw_src)/sprite.h $(sw_src)/track.h
-$(sw_obj)/demo.$o: $(sw_src)/demo.cpp $(build_h) $(sw_src)/keys.h $(names2_h) $(panel_h) $(game_h) $(sw_src)/net.h $(sw_src)/mytypes.h $(mact_inc)/control.h $(sw_src)/function.h $(sw_src)/demo.h $(sw_src)/player.h $(sw_src)/menus.h
-$(sw_obj)/draw.$o: $(sw_src)/draw.cpp $(build_h) $(sw_src)/keys.h $(names2_h) $(panel_h) $(game_h) $(sw_src)/quake.h $(sw_src)/vis.h $(sw_src)/jsector.h $(sw_src)/reserve.h $(sw_src)/mytypes.h $(mact_inc)/control.h $(sw_src)/function.h $(sw_src)/net.h $(sw_src)/pal.h $(sw_src)/player.h $(sw_src)/jtags.h $(sw_src)/parent.h $(sw_src)/cache.h $(sw_src)/text.h $(sw_src)/menus.h $(sw_src)/interp.h $(sw_src)/sector.h
+$(sw_obj)/demo.$o: $(sw_src)/demo.cpp $(build_h) $(sw_src)/keys.h $(names2_h) $(panel_h) $(game_h) $(sw_src)/network.h $(sw_src)/mytypes.h $(mact_inc)/control.h $(sw_src)/function.h $(sw_src)/demo.h $(sw_src)/player.h $(sw_src)/menus.h
+$(sw_obj)/draw.$o: $(sw_src)/draw.cpp $(build_h) $(sw_src)/keys.h $(names2_h) $(panel_h) $(game_h) $(sw_src)/quake.h $(sw_src)/vis.h $(sw_src)/jsector.h $(sw_src)/reserve.h $(sw_src)/mytypes.h $(mact_inc)/control.h $(sw_src)/function.h $(sw_src)/network.h $(sw_src)/pal.h $(sw_src)/player.h $(sw_src)/jtags.h $(sw_src)/parent.h $(sw_src)/cache.h $(sw_src)/text.h $(sw_src)/menus.h $(sw_src)/interp.h $(sw_src)/sector.h
$(sw_obj)/eel.$o: $(sw_src)/eel.cpp $(build_h) $(sw_src)/keys.h $(names2_h) $(game_h) $(tags_h) $(sw_src)/ai.h $(sw_src)/actor.h $(sw_src)/weapon.h $(sw_src)/track.h $(sw_src)/saveable.h
-$(sw_obj)/game.$o: $(sw_src)/game.cpp $(build_h) $(sw_src)/keys.h $(names2_h) $(panel_h) $(game_h) $(tags_h) $(sw_src)/sector.h $(sw_src)/sprite.h $(sw_src)/weapon.h $(sw_src)/player.h $(sw_src)/lists.h $(sw_src)/net.h $(sw_src)/pal.h $(audiolib_inc)/fx_man.h $(sw_src)/mytypes.h $(sw_src)/menus.h $(mact_inc)/control.h $(sw_src)/function.h $(sw_src)/demo.h $(sw_src)/cache.h $(sw_src)/anim.h $(sw_src)/colormap.h $(sw_src)/break.h $(sw_src)/ninja.h $(sw_src)/light.h $(sw_src)/track.h $(sw_src)/jsector.h $(mact_inc)/keyboard.h $(sw_src)/text.h $(audiolib_inc)/music.h $(sw_src)/saveable.h
-$(sw_obj)/girlninj.$o: $(sw_src)/girlninj.cpp $(build_h) $(sw_src)/keys.h $(names2_h) $(panel_h) $(game_h) $(tags_h) $(sw_src)/ai.h $(sw_src)/pal.h $(sw_src)/player.h $(sw_src)/net.h $(sw_src)/actor.h $(sw_src)/track.h $(sw_src)/sprite.h $(sw_src)/saveable.h
+$(sw_obj)/game.$o: $(sw_src)/game.cpp $(build_h) $(sw_src)/keys.h $(names2_h) $(panel_h) $(game_h) $(tags_h) $(sw_src)/sector.h $(sw_src)/sprite.h $(sw_src)/weapon.h $(sw_src)/player.h $(sw_src)/lists.h $(sw_src)/network.h $(sw_src)/pal.h $(audiolib_inc)/fx_man.h $(sw_src)/mytypes.h $(sw_src)/menus.h $(mact_inc)/control.h $(sw_src)/function.h $(sw_src)/demo.h $(sw_src)/cache.h $(sw_src)/anim.h $(sw_src)/colormap.h $(sw_src)/break.h $(sw_src)/ninja.h $(sw_src)/light.h $(sw_src)/track.h $(sw_src)/jsector.h $(mact_inc)/keyboard.h $(sw_src)/text.h $(audiolib_inc)/music.h $(sw_src)/saveable.h
+$(sw_obj)/girlninj.$o: $(sw_src)/girlninj.cpp $(build_h) $(sw_src)/keys.h $(names2_h) $(panel_h) $(game_h) $(tags_h) $(sw_src)/ai.h $(sw_src)/pal.h $(sw_src)/player.h $(sw_src)/network.h $(sw_src)/actor.h $(sw_src)/track.h $(sw_src)/sprite.h $(sw_src)/saveable.h
$(sw_obj)/goro.$o: $(sw_src)/goro.cpp $(build_h) $(sw_src)/keys.h $(names2_h) $(game_h) $(tags_h) $(sw_src)/ai.h $(sw_src)/actor.h $(sw_src)/track.h $(sw_src)/saveable.h
$(sw_obj)/hornet.$o: $(sw_src)/hornet.cpp $(build_h) $(sw_src)/keys.h $(names2_h) $(game_h) $(tags_h) $(sw_src)/ai.h $(sw_src)/actor.h $(sw_src)/weapon.h $(sw_src)/track.h $(sw_src)/sprite.h $(sw_src)/saveable.h
$(sw_obj)/interp.$o: $(sw_src)/interp.cpp $(sw_src)/interp.h
$(sw_obj)/interpsh.$o: $(sw_src)/interpsh.cpp $(sw_src)/interp.h
$(sw_obj)/inv.$o: $(sw_src)/inv.cpp $(build_h) $(sw_src)/keys.h $(names2_h) $(panel_h) $(game_h) $(sw_src)/pal.h $(sw_src)/text.h $(sw_src)/colormap.h $(sw_src)/player.h
-$(sw_obj)/jplayer.$o: $(sw_src)/jplayer.cpp $(build_h) $(sw_src)/mytypes.h $(sw_src)/keys.h $(names2_h) $(panel_h) $(game_h) $(tags_h) $(sw_src)/player.h $(sw_src)/lists.h $(sw_src)/warp.h $(sw_src)/quake.h $(sw_src)/function.h $(mact_inc)/control.h $(sw_src)/trigger.h $(sw_src)/savedef.h $(sw_src)/menus.h $(sw_src)/net.h $(sw_src)/pal.h $(sw_src)/bots.h
+$(sw_obj)/jplayer.$o: $(sw_src)/jplayer.cpp $(build_h) $(sw_src)/mytypes.h $(sw_src)/keys.h $(names2_h) $(panel_h) $(game_h) $(tags_h) $(sw_src)/player.h $(sw_src)/lists.h $(sw_src)/warp.h $(sw_src)/quake.h $(sw_src)/function.h $(mact_inc)/control.h $(sw_src)/trigger.h $(sw_src)/savedef.h $(sw_src)/menus.h $(sw_src)/network.h $(sw_src)/pal.h $(sw_src)/bots.h
$(sw_obj)/jsector.$o: $(sw_src)/jsector.cpp $(build_h) $(sw_src)/keys.h $(names2_h) $(sw_src)/jnames.h $(panel_h) $(game_h) $(tags_h) $(sw_src)/sector.h $(sw_src)/player.h $(sw_src)/sprite.h $(sw_src)/reserve.h $(sw_src)/jsector.h $(sw_src)/jtags.h $(sw_src)/lists.h $(sw_src)/pal.h $(sw_src)/parent.h
-$(sw_obj)/jweapon.$o: $(sw_src)/jweapon.cpp $(build_h) $(sw_src)/keys.h $(names2_h) $(panel_h) $(game_h) $(tags_h) $(sw_src)/break.h $(sw_src)/quake.h $(sw_src)/net.h $(sw_src)/pal.h $(sw_src)/ai.h $(sw_src)/weapon.h $(sw_src)/sprite.h $(sw_src)/sector.h $(sw_src)/actor.h $(sw_src)/saveable.h
+$(sw_obj)/jweapon.$o: $(sw_src)/jweapon.cpp $(build_h) $(sw_src)/keys.h $(names2_h) $(panel_h) $(game_h) $(tags_h) $(sw_src)/break.h $(sw_src)/quake.h $(sw_src)/network.h $(sw_src)/pal.h $(sw_src)/ai.h $(sw_src)/weapon.h $(sw_src)/sprite.h $(sw_src)/sector.h $(sw_src)/actor.h $(sw_src)/saveable.h
$(sw_obj)/lava.$o: $(sw_src)/lava.cpp $(build_h) $(sw_src)/keys.h $(names2_h) $(panel_h) $(game_h) $(tags_h) $(sw_src)/ai.h $(sw_src)/actor.h $(sw_src)/track.h
$(sw_obj)/light.$o: $(sw_src)/light.cpp $(build_h) $(names2_h) $(game_h) $(sw_src)/light.h
$(sw_obj)/mclip.$o: $(sw_src)/mclip.cpp $(build_h) $(sw_src)/mytypes.h $(sw_src)/keys.h $(names2_h) $(panel_h) $(game_h) $(tags_h) $(sw_src)/player.h $(sw_src)/mclip.h
$(sw_obj)/mdastr.$o: $(sw_src)/mdastr.cpp $(build_h) $(sw_src)/mytypes.h $(sw_src)/keys.h $(names2_h) $(game_h)
-$(sw_obj)/menus.$o: $(sw_src)/menus.cpp $(build_h) $(sw_src)/keys.h $(names2_h) $(panel_h) $(game_h) $(tags_h) $(sw_src)/sector.h $(sw_src)/sprite.h $(sw_src)/weapon.h $(sw_src)/player.h $(sw_src)/jsector.h $(sw_src)/reserve.h $(mact_inc)/control.h $(sw_src)/menus.h $(sw_src)/sw_strs.h $(sw_src)/pal.h $(sw_src)/function.h $(sw_src)/net.h $(audiolib_inc)/fx_man.h $(audiolib_inc)/music.h $(sw_src)/text.h $(sw_src)/colormap.h
+$(sw_obj)/menus.$o: $(sw_src)/menus.cpp $(build_h) $(sw_src)/keys.h $(names2_h) $(panel_h) $(game_h) $(tags_h) $(sw_src)/sector.h $(sw_src)/sprite.h $(sw_src)/weapon.h $(sw_src)/player.h $(sw_src)/jsector.h $(sw_src)/reserve.h $(mact_inc)/control.h $(sw_src)/menus.h $(sw_src)/sw_strs.h $(sw_src)/pal.h $(sw_src)/function.h $(sw_src)/network.h $(audiolib_inc)/fx_man.h $(audiolib_inc)/music.h $(sw_src)/text.h $(sw_src)/colormap.h
$(sw_obj)/miscactr.$o: $(sw_src)/miscactr.cpp $(build_h) $(sw_src)/keys.h $(names2_h) $(panel_h) $(game_h) $(tags_h) $(sw_src)/ai.h $(sw_src)/quake.h $(audiolib_inc)/fx_man.h $(sw_src)/actor.h $(sw_src)/sector.h $(sw_src)/sprite.h $(sw_src)/saveable.h
$(sw_obj)/morph.$o: $(sw_src)/morph.cpp $(build_h) $(names2_h) $(panel_h) $(game_h) $(tags_h) $(sw_src)/sector.h $(sw_src)/ai.h $(sw_src)/player.h $(sw_src)/saveable.h
-$(sw_obj)/net.$o: $(sw_src)/net.cpp $(build_h) $(sw_src)/keys.h $(names2_h) $(tags_h) $(game_h) $(sw_src)/net.h $(sw_src)/pal.h $(sw_src)/weapon.h $(sw_src)/text.h $(sw_src)/menus.h
-$(sw_obj)/ninja.$o: $(sw_src)/ninja.cpp $(build_h) $(sw_src)/keys.h $(names2_h) $(panel_h) $(game_h) $(tags_h) $(sw_src)/ai.h $(sw_src)/pal.h $(sw_src)/player.h $(sw_src)/net.h $(sw_src)/weapon.h $(sw_src)/track.h $(sw_src)/actor.h $(sw_src)/ninja.h $(sw_src)/sprite.h $(sw_src)/saveable.h
-$(sw_obj)/panel.$o: $(sw_src)/panel.cpp $(build_h) $(sw_src)/keys.h $(names2_h) $(panel_h) $(sw_src)/lists.h $(game_h) $(sw_src)/net.h $(sw_src)/pal.h $(sw_src)/vis.h $(sw_src)/weapon.h $(audiolib_inc)/fx_man.h $(sw_src)/text.h $(sw_src)/player.h $(sw_src)/saveable.h
-$(sw_obj)/player.$o: $(sw_src)/player.cpp $(build_h) $(sw_src)/mytypes.h $(sw_src)/keys.h $(names2_h) $(panel_h) $(game_h) $(tags_h) $(sw_src)/player.h $(sw_src)/lists.h $(sw_src)/warp.h $(sw_src)/quake.h $(sw_src)/text.h $(sw_src)/function.h $(mact_inc)/control.h $(sw_src)/trigger.h $(sw_src)/savedef.h $(sw_src)/menus.h $(sw_src)/net.h $(sw_src)/pal.h $(sw_src)/demo.h $(sw_src)/mclip.h $(audiolib_inc)/fx_man.h $(sw_src)/sprite.h $(sw_src)/weapon.h $(sw_src)/ninja.h $(sw_src)/break.h $(sw_src)/jsector.h $(sw_src)/sector.h $(sw_src)/actor.h $(sw_src)/colormap.h $(audiolib_inc)/music.h $(sw_src)/vis.h $(sw_src)/track.h $(sw_src)/interp.h $(sw_src)/saveable.h
-$(sw_obj)/predict.$o: $(sw_src)/predict.cpp $(build_h) $(sw_src)/keys.h $(names2_h) $(panel_h) $(game_h) $(sw_src)/net.h
+$(sw_obj)/network.$o: $(sw_src)/network.cpp $(build_h) $(sw_src)/keys.h $(names2_h) $(tags_h) $(game_h) $(sw_src)/network.h $(sw_src)/pal.h $(sw_src)/weapon.h $(sw_src)/text.h $(sw_src)/menus.h
+$(sw_obj)/ninja.$o: $(sw_src)/ninja.cpp $(build_h) $(sw_src)/keys.h $(names2_h) $(panel_h) $(game_h) $(tags_h) $(sw_src)/ai.h $(sw_src)/pal.h $(sw_src)/player.h $(sw_src)/network.h $(sw_src)/weapon.h $(sw_src)/track.h $(sw_src)/actor.h $(sw_src)/ninja.h $(sw_src)/sprite.h $(sw_src)/saveable.h
+$(sw_obj)/panel.$o: $(sw_src)/panel.cpp $(build_h) $(sw_src)/keys.h $(names2_h) $(panel_h) $(sw_src)/lists.h $(game_h) $(sw_src)/network.h $(sw_src)/pal.h $(sw_src)/vis.h $(sw_src)/weapon.h $(audiolib_inc)/fx_man.h $(sw_src)/text.h $(sw_src)/player.h $(sw_src)/saveable.h
+$(sw_obj)/player.$o: $(sw_src)/player.cpp $(build_h) $(sw_src)/mytypes.h $(sw_src)/keys.h $(names2_h) $(panel_h) $(game_h) $(tags_h) $(sw_src)/player.h $(sw_src)/lists.h $(sw_src)/warp.h $(sw_src)/quake.h $(sw_src)/text.h $(sw_src)/function.h $(mact_inc)/control.h $(sw_src)/trigger.h $(sw_src)/savedef.h $(sw_src)/menus.h $(sw_src)/network.h $(sw_src)/pal.h $(sw_src)/demo.h $(sw_src)/mclip.h $(audiolib_inc)/fx_man.h $(sw_src)/sprite.h $(sw_src)/weapon.h $(sw_src)/ninja.h $(sw_src)/break.h $(sw_src)/jsector.h $(sw_src)/sector.h $(sw_src)/actor.h $(sw_src)/colormap.h $(audiolib_inc)/music.h $(sw_src)/vis.h $(sw_src)/track.h $(sw_src)/interp.h $(sw_src)/saveable.h
+$(sw_obj)/predict.$o: $(sw_src)/predict.cpp $(build_h) $(sw_src)/keys.h $(names2_h) $(panel_h) $(game_h) $(sw_src)/network.h
$(sw_obj)/quake.$o: $(sw_src)/quake.cpp $(build_h) $(names2_h) $(game_h) $(tags_h) $(sw_src)/break.h $(sw_src)/quake.h $(sw_src)/sprite.h $(sw_src)/saveable.h
$(sw_obj)/ripper.$o: $(sw_src)/ripper.cpp $(build_h) $(sw_src)/keys.h $(names2_h) $(panel_h) $(game_h) $(tags_h) $(sw_src)/ai.h $(sw_src)/pal.h $(sw_src)/actor.h $(sw_src)/sprite.h $(sw_src)/track.h $(sw_src)/saveable.h
$(sw_obj)/ripper2.$o: $(sw_src)/ripper2.cpp $(build_h) $(sw_src)/keys.h $(names2_h) $(panel_h) $(game_h) $(tags_h) $(sw_src)/ai.h $(sw_src)/pal.h $(sw_src)/actor.h $(sw_src)/sprite.h $(sw_src)/track.h $(audiolib_inc)/fx_man.h $(sw_src)/saveable.h
$(sw_obj)/rooms.$o: $(sw_src)/rooms.cpp $(build_h) $(names2_h) $(panel_h) $(game_h) $(sw_src)/warp.h
-$(sw_obj)/rotator.$o: $(sw_src)/rotator.cpp $(build_h) $(names2_h) $(panel_h) $(game_h) $(sw_src)/net.h $(tags_h) $(sw_src)/sector.h $(sw_src)/text.h $(sw_src)/interp.h $(sw_src)/sprite.h $(sw_src)/saveable.h
+$(sw_obj)/rotator.$o: $(sw_src)/rotator.cpp $(build_h) $(names2_h) $(panel_h) $(game_h) $(sw_src)/network.h $(tags_h) $(sw_src)/sector.h $(sw_src)/text.h $(sw_src)/interp.h $(sw_src)/sprite.h $(sw_src)/saveable.h
$(sw_obj)/rts.$o: $(sw_src)/rts.cpp $(sw_src)/mytypes.h $(sw_src)/_rts.h $(sw_src)/rts.h $(sw_src)/cache.h
-$(sw_obj)/save.$o: $(sw_src)/save.cpp $(build_h) $(sw_src)/keys.h $(names2_h) $(panel_h) $(game_h) $(tags_h) $(sw_src)/lists.h $(sw_src)/interp.h $(sw_src)/net.h $(sw_src)/savedef.h $(sw_src)/jsector.h $(sw_src)/parent.h $(sw_src)/reserve.h $(sw_src)/mfile.h $(sw_src)/weapon.h $(sw_src)/cache.h $(sw_src)/colormap.h $(sw_src)/player.h $(audiolib_inc)/fx_man.h $(audiolib_inc)/music.h $(sw_src)/saveable.h
+$(sw_obj)/save.$o: $(sw_src)/save.cpp $(build_h) $(sw_src)/keys.h $(names2_h) $(panel_h) $(game_h) $(tags_h) $(sw_src)/lists.h $(sw_src)/interp.h $(sw_src)/network.h $(sw_src)/savedef.h $(sw_src)/jsector.h $(sw_src)/parent.h $(sw_src)/reserve.h $(sw_src)/mfile.h $(sw_src)/weapon.h $(sw_src)/cache.h $(sw_src)/colormap.h $(sw_src)/player.h $(audiolib_inc)/fx_man.h $(audiolib_inc)/music.h $(sw_src)/saveable.h
$(sw_obj)/scrip2.$o: $(sw_src)/scrip2.cpp $(build_h) $(sw_src)/keys.h $(names2_h) $(panel_h) $(game_h) $(sw_src)/parse.h $(sw_src)/jsector.h $(sw_src)/parent.h
-$(sw_obj)/sector.$o: $(sw_src)/sector.cpp $(build_h) $(sw_src)/keys.h $(names2_h) $(panel_h) $(game_h) $(tags_h) $(sw_src)/sector.h $(sw_src)/player.h $(sw_src)/quake.h $(sw_src)/weapon.h $(sw_src)/jtags.h $(sw_src)/net.h $(sw_src)/break.h $(sw_src)/track.h $(sw_src)/sprite.h $(sw_src)/light.h $(sw_src)/text.h
+$(sw_obj)/sector.$o: $(sw_src)/sector.cpp $(build_h) $(sw_src)/keys.h $(names2_h) $(panel_h) $(game_h) $(tags_h) $(sw_src)/sector.h $(sw_src)/player.h $(sw_src)/quake.h $(sw_src)/weapon.h $(sw_src)/jtags.h $(sw_src)/network.h $(sw_src)/break.h $(sw_src)/track.h $(sw_src)/sprite.h $(sw_src)/light.h $(sw_src)/text.h
$(sw_obj)/serp.$o: $(sw_src)/serp.cpp $(build_h) $(sw_src)/keys.h $(names2_h) $(game_h) $(tags_h) $(sw_src)/ai.h $(sw_src)/actor.h $(sw_src)/track.h $(sw_src)/sector.h
$(sw_obj)/setup.$o: $(sw_src)/setup.cpp $(build_h) $(sw_src)/keys.h $(game_h) $(sw_src)/mytypes.h $(audiolib_inc)/fx_man.h $(audiolib_inc)/music.h $(mact_inc)/scriplib.h $(sw_src)/gamedefs.h $(mact_inc)/keyboard.h $(mact_inc)/control.h $(sw_src)/config.h $(sw_src)/sounds.h $(sw_src)/function.h $(sw_src)/rts.h
$(sw_obj)/skel.$o: $(sw_src)/skel.cpp $(build_h) $(sw_src)/keys.h $(names2_h) $(game_h) $(tags_h) $(sw_src)/ai.h $(sw_src)/actor.h $(sw_src)/track.h
$(sw_obj)/skull.$o: $(sw_src)/skull.cpp $(build_h) $(sw_src)/keys.h $(names2_h) $(game_h) $(tags_h) $(sw_src)/ai.h $(sw_src)/weapon.h $(sw_src)/actor.h
-$(sw_obj)/slidor.$o: $(sw_src)/slidor.cpp $(build_h) $(names2_h) $(panel_h) $(game_h) $(sw_src)/net.h $(tags_h) $(sw_src)/slidor.h $(sw_src)/slidor.h $(sw_src)/sector.h $(sw_src)/interp.h $(sw_src)/text.h $(sw_src)/sprite.h $(sw_src)/saveable.h
-$(sw_obj)/sounds.$o: $(sw_src)/sounds.cpp $(build_h) $(sw_src)/keys.h $(names2_h) $(sw_src)/mytypes.h $(audiolib_inc)/fx_man.h $(audiolib_inc)/music.h $(sw_src)/gamedefs.h $(sw_src)/config.h $(panel_h) $(game_h) $(sw_src)/sounds.h $(sw_src)/ai.h $(sw_src)/net.h $(sw_src)/cache.h $(sw_src)/text.h $(sw_src)/rts.h $(sw_src)/menus.h
+$(sw_obj)/slidor.$o: $(sw_src)/slidor.cpp $(build_h) $(names2_h) $(panel_h) $(game_h) $(sw_src)/network.h $(tags_h) $(sw_src)/slidor.h $(sw_src)/slidor.h $(sw_src)/sector.h $(sw_src)/interp.h $(sw_src)/text.h $(sw_src)/sprite.h $(sw_src)/saveable.h
+$(sw_obj)/sounds.$o: $(sw_src)/sounds.cpp $(build_h) $(sw_src)/keys.h $(names2_h) $(sw_src)/mytypes.h $(audiolib_inc)/fx_man.h $(audiolib_inc)/music.h $(sw_src)/gamedefs.h $(sw_src)/config.h $(panel_h) $(game_h) $(sw_src)/sounds.h $(sw_src)/ai.h $(sw_src)/network.h $(sw_src)/cache.h $(sw_src)/text.h $(sw_src)/rts.h $(sw_src)/menus.h
$(sw_obj)/spike.$o: $(sw_src)/spike.cpp $(build_h) $(names2_h) $(panel_h) $(game_h) $(tags_h) $(sw_src)/sector.h $(sw_src)/sprite.h $(sw_src)/saveable.h
-$(sw_obj)/sprite.$o: $(sw_src)/sprite.cpp $(sw_src)/keys.h $(names2_h) $(panel_h) $(game_h) $(tags_h) $(sw_src)/ai.h $(sw_src)/warp.h $(sw_src)/light.h $(sw_src)/break.h $(sw_src)/net.h $(sw_src)/pal.h $(sw_src)/sounds.h $(sw_src)/interp.h $(sw_src)/sprite.h $(sw_src)/weapon.h $(sw_src)/jsector.h $(sw_src)/text.h $(sw_src)/slidor.h $(sw_src)/player.h $(sw_src)/saveable.h
+$(sw_obj)/sprite.$o: $(sw_src)/sprite.cpp $(sw_src)/keys.h $(names2_h) $(panel_h) $(game_h) $(tags_h) $(sw_src)/ai.h $(sw_src)/warp.h $(sw_src)/light.h $(sw_src)/break.h $(sw_src)/network.h $(sw_src)/pal.h $(sw_src)/sounds.h $(sw_src)/interp.h $(sw_src)/sprite.h $(sw_src)/weapon.h $(sw_src)/jsector.h $(sw_src)/text.h $(sw_src)/slidor.h $(sw_src)/player.h $(sw_src)/saveable.h
$(sw_obj)/sumo.$o: $(sw_src)/sumo.cpp $(build_h) $(sw_src)/keys.h $(names2_h) $(panel_h) $(game_h) $(tags_h) $(sw_src)/ai.h $(sw_src)/quake.h $(sw_src)/actor.h $(sw_src)/track.h $(sw_src)/weapon.h $(sw_src)/sector.h
$(sw_obj)/swconfig.$o: $(sw_src)/swconfig.cpp $(build_h) $(sw_src)/keys.h $(names2_h) $(panel_h) $(game_h) $(sw_src)/mytypes.h $(mact_inc)/scriplib.h $(audiolib_inc)/fx_man.h $(sw_src)/gamedefs.h $(sw_src)/common_game.h $(sw_src)/config.h $(sw_src)/function.h $(sw_src)/rts.h
-$(sw_obj)/sync.$o: $(sw_src)/sync.cpp $(sw_src)/keys.h $(game_h) $(tags_h) $(names2_h) $(sw_src)/net.h $(sw_src)/menus.h
-$(sw_obj)/text.$o: $(sw_src)/text.cpp $(build_h) $(sw_src)/keys.h $(names2_h) $(panel_h) $(sw_src)/lists.h $(game_h) $(sw_src)/pal.h $(sw_src)/text.h $(sw_src)/net.h
+$(sw_obj)/sync.$o: $(sw_src)/sync.cpp $(sw_src)/keys.h $(game_h) $(tags_h) $(names2_h) $(sw_src)/network.h $(sw_src)/menus.h
+$(sw_obj)/text.$o: $(sw_src)/text.cpp $(build_h) $(sw_src)/keys.h $(names2_h) $(panel_h) $(sw_src)/lists.h $(game_h) $(sw_src)/pal.h $(sw_src)/text.h $(sw_src)/network.h
$(sw_obj)/timer.$o: $(sw_src)/timer.cpp $(sw_src)/keys.h $(names2_h) $(panel_h) $(game_h) $(tags_h) $(sw_src)/sector.h $(sw_src)/sprite.h $(sw_src)/weapon.h $(audiolib_inc)/fx_man.h $(audiolib_inc)/music.h $(sw_src)/audiofx.h
-$(sw_obj)/track.$o: $(sw_src)/track.cpp $(build_h) $(names2_h) $(panel_h) $(tags_h) $(sw_src)/sector.h $(sw_src)/ai.h $(sw_src)/player.h $(game_h) $(sw_src)/net.h $(sw_src)/sprite.h $(sw_src)/track.h $(sw_src)/weapon.h $(sw_src)/saveable.h
-$(sw_obj)/vator.$o: $(sw_src)/vator.cpp $(build_h) $(names2_h) $(panel_h) $(game_h) $(sw_src)/net.h $(tags_h) $(sw_src)/sector.h $(sw_src)/interp.h $(sw_src)/text.h $(sw_src)/sprite.h $(sw_src)/weapon.h $(sw_src)/saveable.h
+$(sw_obj)/track.$o: $(sw_src)/track.cpp $(build_h) $(names2_h) $(panel_h) $(tags_h) $(sw_src)/sector.h $(sw_src)/ai.h $(sw_src)/player.h $(game_h) $(sw_src)/network.h $(sw_src)/sprite.h $(sw_src)/track.h $(sw_src)/weapon.h $(sw_src)/saveable.h
+$(sw_obj)/vator.$o: $(sw_src)/vator.cpp $(build_h) $(names2_h) $(panel_h) $(game_h) $(sw_src)/network.h $(tags_h) $(sw_src)/sector.h $(sw_src)/interp.h $(sw_src)/text.h $(sw_src)/sprite.h $(sw_src)/weapon.h $(sw_src)/saveable.h
$(sw_obj)/vis.$o: $(sw_src)/vis.cpp $(build_h) $(names2_h) $(game_h) $(tags_h) $(sw_src)/break.h $(sw_src)/quake.h $(sw_src)/pal.h $(sw_src)/sprite.h
$(sw_obj)/wallmove.$o: $(sw_src)/wallmove.cpp $(build_h) $(names2_h) $(game_h) $(tags_h) $(sw_src)/weapon.h $(sw_src)/sprite.h
$(sw_obj)/warp.$o: $(sw_src)/warp.cpp $(build_h) $(names2_h) $(panel_h) $(game_h) $(sw_src)/warp.h
-$(sw_obj)/weapon.$o: $(sw_src)/weapon.cpp $(build_h) $(sw_src)/keys.h $(names2_h) $(panel_h) $(game_h) $(tags_h) $(sw_src)/break.h $(sw_src)/quake.h $(sw_src)/net.h $(sw_src)/pal.h $(sw_src)/vis.h $(sw_src)/ai.h $(sw_src)/weapon.h $(sw_src)/anim.h $(sw_src)/damage.h $(sw_src)/sector.h $(sw_src)/sprite.h $(sw_src)/actor.h $(sw_src)/track.h $(sw_src)/player.h
+$(sw_obj)/weapon.$o: $(sw_src)/weapon.cpp $(build_h) $(sw_src)/keys.h $(names2_h) $(panel_h) $(game_h) $(tags_h) $(sw_src)/break.h $(sw_src)/quake.h $(sw_src)/network.h $(sw_src)/pal.h $(sw_src)/vis.h $(sw_src)/ai.h $(sw_src)/weapon.h $(sw_src)/anim.h $(sw_src)/damage.h $(sw_src)/sector.h $(sw_src)/sprite.h $(sw_src)/actor.h $(sw_src)/track.h $(sw_src)/player.h
$(sw_obj)/zilla.$o: $(sw_src)/zilla.cpp $(build_h) $(sw_src)/keys.h $(names2_h) $(panel_h) $(game_h) $(tags_h) $(sw_src)/ai.h $(sw_src)/quake.h $(sw_src)/actor.h $(sw_src)/track.h $(audiolib_inc)/fx_man.h
-$(sw_obj)/zombie.$o: $(sw_src)/zombie.cpp $(build_h) $(sw_src)/keys.h $(names2_h) $(panel_h) $(game_h) $(tags_h) $(sw_src)/ai.h $(sw_src)/pal.h $(sw_src)/player.h $(sw_src)/net.h $(sw_src)/sprite.h $(sw_src)/weapon.h $(sw_src)/actor.h $(sw_src)/track.h
+$(sw_obj)/zombie.$o: $(sw_src)/zombie.cpp $(build_h) $(sw_src)/keys.h $(names2_h) $(panel_h) $(game_h) $(tags_h) $(sw_src)/ai.h $(sw_src)/pal.h $(sw_src)/player.h $(sw_src)/network.h $(sw_src)/sprite.h $(sw_src)/weapon.h $(sw_src)/actor.h $(sw_src)/track.h
$(sw_obj)/saveable.$o: $(sw_src)/saveable.cpp $(engine_inc)/compat.h $(sw_src)/saveable.h
$(sw_obj)/jnstub.$o: $(sw_src)/jnstub.cpp $(build_h) $(sw_src)/stag.h $(sw_src)/keys.h $(names2_h) $(game_h) $(tags_h) $(sw_src)/pal.h $(engine_inc)/pragmas.h $(engine_inc)/editor.h $(engine_inc)/cache1d.h
diff --git a/source/sw/src/ai.cpp b/source/sw/src/ai.cpp
index 944289d5b..f4e9c009f 100644
--- a/source/sw/src/ai.cpp
+++ b/source/sw/src/ai.cpp
@@ -37,7 +37,7 @@ Prepared for public release: 03/28/2005 - Charlie Wiederhold, 3D Realms
#include "ninja.h"
#include "ai.h"
-#include "net.h"
+#include "network.h"
SWBOOL PlayerTakeDamage(PLAYERp, short);
ANIMATOR InitActorRunToward;
diff --git a/source/sw/src/anim.cpp b/source/sw/src/anim.cpp
index 2207f553d..3ee89acb6 100644
--- a/source/sw/src/anim.cpp
+++ b/source/sw/src/anim.cpp
@@ -41,7 +41,7 @@ Prepared for public release: 03/28/2005 - Charlie Wiederhold, 3D Realms
#include "game.h"
#include "colormap.h"
-#include "net.h"
+#include "network.h"
#include "animlib.h"
#include "anim.h"
diff --git a/source/sw/src/border.cpp b/source/sw/src/border.cpp
index fe6ffe14c..33dbf8dec 100644
--- a/source/sw/src/border.cpp
+++ b/source/sw/src/border.cpp
@@ -31,7 +31,7 @@ Prepared for public release: 03/28/2005 - Charlie Wiederhold, 3D Realms
#include "lists.h"
#include "game.h"
#include "common_game.h"
-#include "net.h"
+#include "network.h"
#include "text.h"
#define BAR_HEIGHT 48
diff --git a/source/sw/src/cache.cpp b/source/sw/src/cache.cpp
index 26f496b76..5c4910236 100644
--- a/source/sw/src/cache.cpp
+++ b/source/sw/src/cache.cpp
@@ -40,7 +40,7 @@ not load" error messages.
#include "pal.h"
#include "cache.h"
#include "sounds.h"
-#include "net.h"
+#include "network.h"
// Run the game with the -CACHEPRINT option and redirect to a file.
// It will save out the tile and sound number every time one caches.
diff --git a/source/sw/src/console.cpp b/source/sw/src/console.cpp
index d45b74cde..b5732f27a 100644
--- a/source/sw/src/console.cpp
+++ b/source/sw/src/console.cpp
@@ -48,7 +48,7 @@ Prepared for public release: 03/28/2005 - Charlie Wiederhold, 3D Realms
#include "savedef.h"
#include "menus.h"
-#include "net.h"
+#include "network.h"
#include "pal.h"
#include "weapon.h"
diff --git a/source/sw/src/demo.cpp b/source/sw/src/demo.cpp
index 1c1c92609..0c358c3e0 100644
--- a/source/sw/src/demo.cpp
+++ b/source/sw/src/demo.cpp
@@ -33,7 +33,7 @@ Prepared for public release: 03/28/2005 - Charlie Wiederhold, 3D Realms
#include "names2.h"
#include "panel.h"
#include "game.h"
-#include "net.h"
+#include "network.h"
#include "mytypes.h"
#include "control.h"
diff --git a/source/sw/src/draw.cpp b/source/sw/src/draw.cpp
index 21f60f4f5..c6f76ad30 100644
--- a/source/sw/src/draw.cpp
+++ b/source/sw/src/draw.cpp
@@ -40,7 +40,7 @@ Prepared for public release: 03/28/2005 - Charlie Wiederhold, 3D Realms
#include "mytypes.h"
#include "control.h"
#include "function.h"
-#include "net.h"
+#include "network.h"
#include "pal.h"
#include "player.h"
#include "jtags.h"
diff --git a/source/sw/src/game.cpp b/source/sw/src/game.cpp
index 9fc4982d0..404309394 100644
--- a/source/sw/src/game.cpp
+++ b/source/sw/src/game.cpp
@@ -59,7 +59,7 @@ Things required to make savegames work:
#include "weapon.h"
#include "player.h"
#include "lists.h"
-#include "net.h"
+#include "network.h"
#include "pal.h"
#include "fx_man.h"
diff --git a/source/sw/src/girlninj.cpp b/source/sw/src/girlninj.cpp
index 03ef8400f..2b11797b4 100644
--- a/source/sw/src/girlninj.cpp
+++ b/source/sw/src/girlninj.cpp
@@ -33,7 +33,7 @@ Prepared for public release: 03/28/2005 - Charlie Wiederhold, 3D Realms
#include "ai.h"
#include "pal.h"
#include "player.h"
-#include "net.h"
+#include "network.h"
#include "actor.h"
#include "track.h"
#include "sprite.h"
diff --git a/source/sw/src/jplayer.cpp b/source/sw/src/jplayer.cpp
index 09bea73fd..101b5eb75 100644
--- a/source/sw/src/jplayer.cpp
+++ b/source/sw/src/jplayer.cpp
@@ -47,7 +47,7 @@ Prepared for public release: 03/28/2005 - Charlie Wiederhold, 3D Realms
#include "savedef.h"
#include "menus.h"
-#include "net.h"
+#include "network.h"
#include "pal.h"
#include "bots.h"
diff --git a/source/sw/src/jweapon.cpp b/source/sw/src/jweapon.cpp
index 96254800b..e70d25f04 100644
--- a/source/sw/src/jweapon.cpp
+++ b/source/sw/src/jweapon.cpp
@@ -34,7 +34,7 @@ Prepared for public release: 03/28/2005 - Charlie Wiederhold, 3D Realms
#include "common_game.h"
#include "break.h"
#include "quake.h"
-#include "net.h"
+#include "network.h"
#include "pal.h"
#include "ai.h"
diff --git a/source/sw/src/menus.cpp b/source/sw/src/menus.cpp
index dfaa5e3dc..ffb1285d6 100644
--- a/source/sw/src/menus.cpp
+++ b/source/sw/src/menus.cpp
@@ -45,7 +45,7 @@ Prepared for public release: 03/28/2005 - Charlie Wiederhold, 3D Realms
#include "function.h"
#include "gamedefs.h"
#include "config.h"
-#include "net.h"
+#include "network.h"
#include "fx_man.h"
#include "music.h"
#include "text.h"
diff --git a/source/sw/src/net.cpp b/source/sw/src/network.cpp
similarity index 99%
rename from source/sw/src/net.cpp
rename to source/sw/src/network.cpp
index 4f98b58c1..095c98162 100644
--- a/source/sw/src/net.cpp
+++ b/source/sw/src/network.cpp
@@ -31,7 +31,7 @@ Prepared for public release: 03/28/2005 - Charlie Wiederhold, 3D Realms
#include "game.h"
#include "tags.h"
#include "names2.h"
-#include "net.h"
+#include "network.h"
#include "pal.h"
#include "demo.h"
diff --git a/source/sw/src/net.h b/source/sw/src/network.h
similarity index 100%
rename from source/sw/src/net.h
rename to source/sw/src/network.h
diff --git a/source/sw/src/ninja.cpp b/source/sw/src/ninja.cpp
index b352c99ea..61f8a1d7f 100644
--- a/source/sw/src/ninja.cpp
+++ b/source/sw/src/ninja.cpp
@@ -33,7 +33,7 @@ Prepared for public release: 03/28/2005 - Charlie Wiederhold, 3D Realms
#include "ai.h"
#include "pal.h"
#include "player.h"
-#include "net.h"
+#include "network.h"
#include "weapon.h"
#include "track.h"
#include "actor.h"
diff --git a/source/sw/src/panel.cpp b/source/sw/src/panel.cpp
index ea9c3475c..4cedcc019 100644
--- a/source/sw/src/panel.cpp
+++ b/source/sw/src/panel.cpp
@@ -34,7 +34,7 @@ Prepared for public release: 03/28/2005 - Charlie Wiederhold, 3D Realms
#include "lists.h"
#include "game.h"
#include "common_game.h"
-#include "net.h"
+#include "network.h"
#include "pal.h"
#include "vis.h"
#include "text.h"
diff --git a/source/sw/src/player.cpp b/source/sw/src/player.cpp
index 74e833da9..b4a0fd5a9 100644
--- a/source/sw/src/player.cpp
+++ b/source/sw/src/player.cpp
@@ -45,7 +45,7 @@ Prepared for public release: 03/28/2005 - Charlie Wiederhold, 3D Realms
#include "savedef.h"
#include "menus.h"
-#include "net.h"
+#include "network.h"
#include "pal.h"
#include "demo.h"
#include "mclip.h"
diff --git a/source/sw/src/predict.cpp b/source/sw/src/predict.cpp
index 4ec311891..3834ec94a 100644
--- a/source/sw/src/predict.cpp
+++ b/source/sw/src/predict.cpp
@@ -38,7 +38,7 @@ Prepared for public release: 03/28/2005 - Charlie Wiederhold, 3D Realms
//#include "mytypes.h"
//#include "control.h"
//#include "function.h"
-#include "net.h"
+#include "network.h"
//#include "symutil.h"
SWBOOL PredictionOn = TRUE;
diff --git a/source/sw/src/rotator.cpp b/source/sw/src/rotator.cpp
index 84fb7633c..fc59ed765 100644
--- a/source/sw/src/rotator.cpp
+++ b/source/sw/src/rotator.cpp
@@ -28,7 +28,7 @@ Prepared for public release: 03/28/2005 - Charlie Wiederhold, 3D Realms
#include "names2.h"
#include "panel.h"
#include "game.h"
-#include "net.h"
+#include "network.h"
#include "tags.h"
#include "sector.h"
#include "text.h"
diff --git a/source/sw/src/save.cpp b/source/sw/src/save.cpp
index aa94d18f0..a08832658 100644
--- a/source/sw/src/save.cpp
+++ b/source/sw/src/save.cpp
@@ -36,7 +36,7 @@ Prepared for public release: 03/28/2005 - Charlie Wiederhold, 3D Realms
#include "lists.h"
#include "interp.h"
-#include "net.h"
+#include "network.h"
//#include "save.h"
#include "savedef.h"
#include "jsector.h"
diff --git a/source/sw/src/sector.cpp b/source/sw/src/sector.cpp
index 3199b0949..e47b9dcdf 100644
--- a/source/sw/src/sector.cpp
+++ b/source/sw/src/sector.cpp
@@ -37,7 +37,7 @@ Prepared for public release: 03/28/2005 - Charlie Wiederhold, 3D Realms
#include "weapon.h"
#include "jtags.h"
-#include "net.h"
+#include "network.h"
#include "break.h"
#include "track.h"
diff --git a/source/sw/src/slidor.cpp b/source/sw/src/slidor.cpp
index 3048c9822..6d86cfd6f 100644
--- a/source/sw/src/slidor.cpp
+++ b/source/sw/src/slidor.cpp
@@ -28,7 +28,7 @@ Prepared for public release: 03/28/2005 - Charlie Wiederhold, 3D Realms
#include "names2.h"
#include "panel.h"
#include "game.h"
-#include "net.h"
+#include "network.h"
#include "tags.h"
#include "slidor.h"
#include "sector.h"
diff --git a/source/sw/src/sounds.cpp b/source/sw/src/sounds.cpp
index 049c0ac20..6f6663990 100644
--- a/source/sw/src/sounds.cpp
+++ b/source/sw/src/sounds.cpp
@@ -41,7 +41,7 @@ Prepared for public release: 03/28/2005 - Charlie Wiederhold, 3D Realms
#include "game.h"
#include "sounds.h"
#include "ai.h"
-#include "net.h"
+#include "network.h"
#include "cache.h"
#include "text.h"
diff --git a/source/sw/src/sprite.cpp b/source/sw/src/sprite.cpp
index 37757a808..c1561d896 100644
--- a/source/sw/src/sprite.cpp
+++ b/source/sw/src/sprite.cpp
@@ -34,7 +34,7 @@ Prepared for public release: 03/28/2005 - Charlie Wiederhold, 3D Realms
#include "warp.h"
#include "light.h"
#include "break.h"
-#include "net.h"
+#include "network.h"
#include "pal.h"
diff --git a/source/sw/src/sync.cpp b/source/sw/src/sync.cpp
index 5447a5737..24dd043e2 100644
--- a/source/sw/src/sync.cpp
+++ b/source/sw/src/sync.cpp
@@ -29,7 +29,7 @@ Prepared for public release: 03/28/2005 - Charlie Wiederhold, 3D Realms
#include "game.h"
#include "tags.h"
#include "names2.h"
-#include "net.h"
+#include "network.h"
#include "menus.h"
SWBOOL SyncPrintMode = TRUE;
diff --git a/source/sw/src/text.cpp b/source/sw/src/text.cpp
index aa5b812ef..2b75a2900 100644
--- a/source/sw/src/text.cpp
+++ b/source/sw/src/text.cpp
@@ -36,7 +36,7 @@ Prepared for public release: 03/28/2005 - Charlie Wiederhold, 3D Realms
#include "text.h"
#include "menus.h"
-#include "net.h"
+#include "network.h"
#define PANEL_FONT_G 3636
#define PANEL_FONT_Y 3646
diff --git a/source/sw/src/track.cpp b/source/sw/src/track.cpp
index c001d8181..6f883eb2d 100644
--- a/source/sw/src/track.cpp
+++ b/source/sw/src/track.cpp
@@ -33,7 +33,7 @@ Prepared for public release: 03/28/2005 - Charlie Wiederhold, 3D Realms
#include "ai.h"
#include "player.h"
#include "game.h"
-#include "net.h"
+#include "network.h"
#include "sprite.h"
#include "track.h"
#include "weapon.h"
diff --git a/source/sw/src/vator.cpp b/source/sw/src/vator.cpp
index 2ef427797..5251474d9 100644
--- a/source/sw/src/vator.cpp
+++ b/source/sw/src/vator.cpp
@@ -28,7 +28,7 @@ Prepared for public release: 03/28/2005 - Charlie Wiederhold, 3D Realms
#include "names2.h"
#include "panel.h"
#include "game.h"
-#include "net.h"
+#include "network.h"
#include "tags.h"
#include "sector.h"
#include "interp.h"
diff --git a/source/sw/src/weapon.cpp b/source/sw/src/weapon.cpp
index a3ce50e66..f8d687478 100644
--- a/source/sw/src/weapon.cpp
+++ b/source/sw/src/weapon.cpp
@@ -34,7 +34,7 @@ Prepared for public release: 03/28/2005 - Charlie Wiederhold, 3D Realms
#include "common_game.h"
#include "break.h"
#include "quake.h"
-#include "net.h"
+#include "network.h"
#include "pal.h"
#include "vis.h"
diff --git a/source/sw/src/zombie.cpp b/source/sw/src/zombie.cpp
index eef6823c5..85c3faad5 100644
--- a/source/sw/src/zombie.cpp
+++ b/source/sw/src/zombie.cpp
@@ -33,7 +33,7 @@ Prepared for public release: 03/28/2005 - Charlie Wiederhold, 3D Realms
#include "ai.h"
#include "pal.h"
#include "player.h"
-#include "net.h"
+#include "network.h"
#include "sprite.h"
#include "weapon.h"
#include "actor.h"