From 7d77b2315f2638d525c6f7c6a3261fce6b8926ae Mon Sep 17 00:00:00 2001 From: Christoph Oelckers Date: Mon, 3 May 2021 19:01:00 +0200 Subject: [PATCH] - merged the few remaining contents of mmulti.h into d_net.h --- source/build/include/mmulti.h | 19 ------------------- source/core/cheats.cpp | 1 - source/core/d_net.cpp | 1 - source/core/d_net.h | 3 +++ source/core/gamecontrol.cpp | 3 +-- source/core/mainloop.cpp | 1 - source/core/savegamehelp.cpp | 2 +- source/games/blood/src/actor.cpp | 1 - source/games/blood/src/ai.cpp | 1 - source/games/blood/src/aibat.cpp | 1 - source/games/blood/src/aibeast.cpp | 1 - source/games/blood/src/aiboneel.cpp | 1 - source/games/blood/src/aiburn.cpp | 1 - source/games/blood/src/aicaleb.cpp | 1 - source/games/blood/src/aicerber.cpp | 1 - source/games/blood/src/aicult.cpp | 1 - source/games/blood/src/aigarg.cpp | 1 - source/games/blood/src/aighost.cpp | 1 - source/games/blood/src/aigilbst.cpp | 1 - source/games/blood/src/aihand.cpp | 1 - source/games/blood/src/aihound.cpp | 1 - source/games/blood/src/aiinnoc.cpp | 1 - source/games/blood/src/aipod.cpp | 1 - source/games/blood/src/airat.cpp | 1 - source/games/blood/src/aispid.cpp | 1 - source/games/blood/src/aitchern.cpp | 1 - source/games/blood/src/aiunicult.cpp | 1 - source/games/blood/src/aizomba.cpp | 1 - source/games/blood/src/aizombf.cpp | 1 - source/games/blood/src/animatesprite.cpp | 1 - source/games/blood/src/blood.cpp | 1 - source/games/blood/src/blood.h | 1 + source/games/blood/src/controls.cpp | 1 - source/games/blood/src/d_menu.cpp | 1 - source/games/blood/src/endgame.cpp | 1 - source/games/blood/src/hudsprites.cpp | 1 - source/games/blood/src/loadsave.cpp | 1 - source/games/blood/src/messages.cpp | 1 - source/games/blood/src/mirrors.cpp | 1 - source/games/blood/src/nnexts.cpp | 1 - source/games/blood/src/osdcmd.cpp | 1 - source/games/blood/src/player.cpp | 1 - source/games/blood/src/prediction.cpp | 1 - source/games/blood/src/sbar.cpp | 1 - source/games/blood/src/triggers.cpp | 1 - source/games/blood/src/view.cpp | 1 - source/games/blood/src/weapon.cpp | 1 - source/games/duke/src/actors_r.cpp | 1 - source/games/duke/src/gamevar.cpp | 1 - source/games/duke/src/global.h | 1 - source/games/exhumed/src/cheats.cpp | 2 +- source/games/exhumed/src/map.cpp | 1 - source/games/exhumed/src/osdcmds.cpp | 1 - source/games/exhumed/src/save.cpp | 1 - source/games/exhumed/src/sound.cpp | 1 - source/games/sw/src/game.h | 2 +- source/games/sw/src/network.cpp | 1 - 57 files changed, 8 insertions(+), 74 deletions(-) delete mode 100644 source/build/include/mmulti.h diff --git a/source/build/include/mmulti.h b/source/build/include/mmulti.h deleted file mode 100644 index 1c5d2c5ea17..00000000000 --- a/source/build/include/mmulti.h +++ /dev/null @@ -1,19 +0,0 @@ -// "Build Engine & Tools" Copyright (c) 1993-1997 Ken Silverman -// Ken Silverman's official web site: "http://www.advsys.net/ken" -// See the included license file "BUILDLIC.TXT" for license info. -// -// This file has been modified from Ken Silverman's original release -// by Jonathon Fowler (jf@jonof.id.au) -// by the EDuke32 team (development@voidpoint.com) - -#ifndef mmulti_h_ -#define mmulti_h_ - -#define MAXMULTIPLAYERS 16 - -extern int myconnectindex, numplayers; -extern int connecthead, connectpoint2[MAXMULTIPLAYERS]; - - -#endif // mmulti_h_ - diff --git a/source/core/cheats.cpp b/source/core/cheats.cpp index d422e5c200e..9b670931cd6 100644 --- a/source/core/cheats.cpp +++ b/source/core/cheats.cpp @@ -41,7 +41,6 @@ #include "c_dispatch.h" #include "d_net.h" #include "gamestate.h" -#include "mmulti.h" #include "gstrings.h" #include "gamecontrol.h" #include "screenjob.h" diff --git a/source/core/d_net.cpp b/source/core/d_net.cpp index 5650ea43f40..30c7891d17f 100644 --- a/source/core/d_net.cpp +++ b/source/core/d_net.cpp @@ -63,7 +63,6 @@ #include "vm.h" #include "gstrings.h" #include "s_music.h" -#include "mmulti.h" #include "printf.h" #include "i_time.h" #include "d_ticcmd.h" diff --git a/source/core/d_net.h b/source/core/d_net.h index 1562c1dbfcc..db4b11f53cc 100644 --- a/source/core/d_net.h +++ b/source/core/d_net.h @@ -10,6 +10,9 @@ enum MAXPLAYERS = 8 }; +extern int myconnectindex, numplayers; +extern int connecthead, connectpoint2[MAXPLAYERS]; + class FDynamicBuffer { public: diff --git a/source/core/gamecontrol.cpp b/source/core/gamecontrol.cpp index 595beb8b40d..7d893d51952 100644 --- a/source/core/gamecontrol.cpp +++ b/source/core/gamecontrol.cpp @@ -57,7 +57,6 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. #include "c_dispatch.h" #include "glbackend/glbackend.h" #include "engineerrors.h" -#include "mmulti.h" #include "gamestate.h" #include "gstrings.h" #include "texturemanager.h" @@ -106,7 +105,7 @@ CUSTOM_CVAR(Int, mouse_capturemode, 1, CVAR_GLOBALCONFIG | CVAR_ARCHIVE) // The last remains of sdlayer.cpp GameInterface* gi; int myconnectindex, numplayers; -int connecthead, connectpoint2[MAXMULTIPLAYERS]; +int connecthead, connectpoint2[MAXPLAYERS]; auto vsnprintfptr = vsnprintf; // This is an inline in Visual Studio but we need an address for it to satisfy the MinGW compiled libraries. int lastTic; diff --git a/source/core/mainloop.cpp b/source/core/mainloop.cpp index 156beead204..ae596dcf128 100644 --- a/source/core/mainloop.cpp +++ b/source/core/mainloop.cpp @@ -74,7 +74,6 @@ #include "vm.h" #include "gamestate.h" #include "screenjob.h" -#include "mmulti.h" #include "c_console.h" #include "uiinput.h" #include "v_video.h" diff --git a/source/core/savegamehelp.cpp b/source/core/savegamehelp.cpp index a0fd0dc879b..9d657341720 100644 --- a/source/core/savegamehelp.cpp +++ b/source/core/savegamehelp.cpp @@ -59,6 +59,7 @@ #include "render.h" #include "hw_sections.h" #include "sectorgeometry.h" +#include "d_net.h" #include @@ -422,7 +423,6 @@ FString G_BuildSaveName (const char *prefix) } #include "build.h" -#include "mmulti.h" #define V(x) x static spritetype zsp; diff --git a/source/games/blood/src/actor.cpp b/source/games/blood/src/actor.cpp index f785719421c..c8887a65bfd 100644 --- a/source/games/blood/src/actor.cpp +++ b/source/games/blood/src/actor.cpp @@ -27,7 +27,6 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. #include "build.h" #include "automap.h" -#include "mmulti.h" #include "savegamehelp.h" #include "blood.h" diff --git a/source/games/blood/src/ai.cpp b/source/games/blood/src/ai.cpp index 3bde01d6636..347f94c34ba 100644 --- a/source/games/blood/src/ai.cpp +++ b/source/games/blood/src/ai.cpp @@ -25,7 +25,6 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. #include "build.h" #include "savegamehelp.h" -#include "mmulti.h" #include "blood.h" diff --git a/source/games/blood/src/aibat.cpp b/source/games/blood/src/aibat.cpp index 6db80f812d2..878affe7d5a 100644 --- a/source/games/blood/src/aibat.cpp +++ b/source/games/blood/src/aibat.cpp @@ -25,7 +25,6 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. #include "compat.h" #include "build.h" -#include "mmulti.h" #include "blood.h" diff --git a/source/games/blood/src/aibeast.cpp b/source/games/blood/src/aibeast.cpp index 30dd7d47ba9..857d01cfe5a 100644 --- a/source/games/blood/src/aibeast.cpp +++ b/source/games/blood/src/aibeast.cpp @@ -25,7 +25,6 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. #include "compat.h" #include "build.h" -#include "mmulti.h" #include "blood.h" diff --git a/source/games/blood/src/aiboneel.cpp b/source/games/blood/src/aiboneel.cpp index 2fccc16743d..0c56f7725cd 100644 --- a/source/games/blood/src/aiboneel.cpp +++ b/source/games/blood/src/aiboneel.cpp @@ -24,7 +24,6 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. #include "ns.h" // Must come before everything else! #include "build.h" -#include "mmulti.h" #include "blood.h" diff --git a/source/games/blood/src/aiburn.cpp b/source/games/blood/src/aiburn.cpp index 15ad1528e20..7470a20e022 100644 --- a/source/games/blood/src/aiburn.cpp +++ b/source/games/blood/src/aiburn.cpp @@ -25,7 +25,6 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. #include "compat.h" #include "build.h" -#include "mmulti.h" #include "blood.h" diff --git a/source/games/blood/src/aicaleb.cpp b/source/games/blood/src/aicaleb.cpp index 9bf1c779f18..7024c0b8fe1 100644 --- a/source/games/blood/src/aicaleb.cpp +++ b/source/games/blood/src/aicaleb.cpp @@ -25,7 +25,6 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. #include "compat.h" #include "build.h" -#include "mmulti.h" #include "blood.h" diff --git a/source/games/blood/src/aicerber.cpp b/source/games/blood/src/aicerber.cpp index 7360f6b8c2f..414d267dcca 100644 --- a/source/games/blood/src/aicerber.cpp +++ b/source/games/blood/src/aicerber.cpp @@ -25,7 +25,6 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. #include "compat.h" #include "build.h" -#include "mmulti.h" #include "blood.h" diff --git a/source/games/blood/src/aicult.cpp b/source/games/blood/src/aicult.cpp index 36703635cfb..e1e8f7ab00b 100644 --- a/source/games/blood/src/aicult.cpp +++ b/source/games/blood/src/aicult.cpp @@ -25,7 +25,6 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. #include "compat.h" #include "build.h" -#include "mmulti.h" #include "blood.h" diff --git a/source/games/blood/src/aigarg.cpp b/source/games/blood/src/aigarg.cpp index b70bc1b6c56..176af80b8f0 100644 --- a/source/games/blood/src/aigarg.cpp +++ b/source/games/blood/src/aigarg.cpp @@ -25,7 +25,6 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. #include "compat.h" #include "build.h" -#include "mmulti.h" #include "blood.h" diff --git a/source/games/blood/src/aighost.cpp b/source/games/blood/src/aighost.cpp index 7b6d3954169..d820cda3fc6 100644 --- a/source/games/blood/src/aighost.cpp +++ b/source/games/blood/src/aighost.cpp @@ -25,7 +25,6 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. #include "compat.h" #include "build.h" -#include "mmulti.h" #include "blood.h" diff --git a/source/games/blood/src/aigilbst.cpp b/source/games/blood/src/aigilbst.cpp index 1de41c886c6..47b6267e967 100644 --- a/source/games/blood/src/aigilbst.cpp +++ b/source/games/blood/src/aigilbst.cpp @@ -25,7 +25,6 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. #include "compat.h" #include "build.h" -#include "mmulti.h" #include "blood.h" diff --git a/source/games/blood/src/aihand.cpp b/source/games/blood/src/aihand.cpp index 389c6bfab5e..5f31be3ff72 100644 --- a/source/games/blood/src/aihand.cpp +++ b/source/games/blood/src/aihand.cpp @@ -25,7 +25,6 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. #include "compat.h" #include "build.h" -#include "mmulti.h" #include "blood.h" diff --git a/source/games/blood/src/aihound.cpp b/source/games/blood/src/aihound.cpp index 790a5180d6f..206871d6e89 100644 --- a/source/games/blood/src/aihound.cpp +++ b/source/games/blood/src/aihound.cpp @@ -25,7 +25,6 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. #include "compat.h" #include "build.h" -#include "mmulti.h" #include "blood.h" diff --git a/source/games/blood/src/aiinnoc.cpp b/source/games/blood/src/aiinnoc.cpp index b0595c5004e..09b83bdd84b 100644 --- a/source/games/blood/src/aiinnoc.cpp +++ b/source/games/blood/src/aiinnoc.cpp @@ -25,7 +25,6 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. #include "compat.h" #include "build.h" -#include "mmulti.h" #include "blood.h" diff --git a/source/games/blood/src/aipod.cpp b/source/games/blood/src/aipod.cpp index 822b4530719..35c98a6c6a5 100644 --- a/source/games/blood/src/aipod.cpp +++ b/source/games/blood/src/aipod.cpp @@ -25,7 +25,6 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. #include "compat.h" #include "build.h" -#include "mmulti.h" #include "blood.h" diff --git a/source/games/blood/src/airat.cpp b/source/games/blood/src/airat.cpp index 53198e62d31..3cf5d93a816 100644 --- a/source/games/blood/src/airat.cpp +++ b/source/games/blood/src/airat.cpp @@ -25,7 +25,6 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. #include "compat.h" #include "build.h" -#include "mmulti.h" #include "blood.h" diff --git a/source/games/blood/src/aispid.cpp b/source/games/blood/src/aispid.cpp index cd34b36e8e2..14517d58a48 100644 --- a/source/games/blood/src/aispid.cpp +++ b/source/games/blood/src/aispid.cpp @@ -25,7 +25,6 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. #include "compat.h" #include "build.h" -#include "mmulti.h" #include "blood.h" diff --git a/source/games/blood/src/aitchern.cpp b/source/games/blood/src/aitchern.cpp index 05cd294b9f8..17be3e2e522 100644 --- a/source/games/blood/src/aitchern.cpp +++ b/source/games/blood/src/aitchern.cpp @@ -25,7 +25,6 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. #include "compat.h" #include "build.h" -#include "mmulti.h" #include "blood.h" diff --git a/source/games/blood/src/aiunicult.cpp b/source/games/blood/src/aiunicult.cpp index 85e6b9ea225..638a15e82e8 100644 --- a/source/games/blood/src/aiunicult.cpp +++ b/source/games/blood/src/aiunicult.cpp @@ -26,7 +26,6 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. #include "compat.h" #include "build.h" -#include "mmulti.h" #include "raze_sound.h" #include "blood.h" diff --git a/source/games/blood/src/aizomba.cpp b/source/games/blood/src/aizomba.cpp index 442bdecfa63..2351e1858e9 100644 --- a/source/games/blood/src/aizomba.cpp +++ b/source/games/blood/src/aizomba.cpp @@ -25,7 +25,6 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. #include "compat.h" #include "build.h" -#include "mmulti.h" #include "blood.h" diff --git a/source/games/blood/src/aizombf.cpp b/source/games/blood/src/aizombf.cpp index ee74f601adc..64b8fbd6d47 100644 --- a/source/games/blood/src/aizombf.cpp +++ b/source/games/blood/src/aizombf.cpp @@ -25,7 +25,6 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. #include "compat.h" #include "build.h" -#include "mmulti.h" #include "blood.h" diff --git a/source/games/blood/src/animatesprite.cpp b/source/games/blood/src/animatesprite.cpp index eaf4de7152c..f96554cca8e 100644 --- a/source/games/blood/src/animatesprite.cpp +++ b/source/games/blood/src/animatesprite.cpp @@ -27,7 +27,6 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. #include "compat.h" #include "build.h" -#include "mmulti.h" #include "v_font.h" #include "blood.h" diff --git a/source/games/blood/src/blood.cpp b/source/games/blood/src/blood.cpp index 2b59a07610d..8b973965d12 100644 --- a/source/games/blood/src/blood.cpp +++ b/source/games/blood/src/blood.cpp @@ -24,7 +24,6 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. #include "ns.h" // Must come before everything else! #include "build.h" -#include "mmulti.h" #include "compat.h" #include "g_input.h" #include "automap.h" diff --git a/source/games/blood/src/blood.h b/source/games/blood/src/blood.h index b1adaec6a84..be2fb4ff01c 100644 --- a/source/games/blood/src/blood.h +++ b/source/games/blood/src/blood.h @@ -25,6 +25,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. #include "build.h" #include "gamestruct.h" #include "mapinfo.h" +#include "d_net.h" #include "common_game.h" #include "fx.h" diff --git a/source/games/blood/src/controls.cpp b/source/games/blood/src/controls.cpp index 9b9c09a7c40..41b5f27eeb9 100644 --- a/source/games/blood/src/controls.cpp +++ b/source/games/blood/src/controls.cpp @@ -24,7 +24,6 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. #include "ns.h" // Must come before everything else! -#include "mmulti.h" #include "blood.h" #include "gamestate.h" #include "inputstate.h" diff --git a/source/games/blood/src/d_menu.cpp b/source/games/blood/src/d_menu.cpp index 7207729dba0..0cacadeb7cc 100644 --- a/source/games/blood/src/d_menu.cpp +++ b/source/games/blood/src/d_menu.cpp @@ -26,7 +26,6 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. #include "build.h" #include "compat.h" -#include "mmulti.h" #include "c_bind.h" #include "razemenu.h" #include "gamestate.h" diff --git a/source/games/blood/src/endgame.cpp b/source/games/blood/src/endgame.cpp index 38b73a489ca..452711f74e3 100644 --- a/source/games/blood/src/endgame.cpp +++ b/source/games/blood/src/endgame.cpp @@ -25,7 +25,6 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. #include "build.h" #include "v_draw.h" -#include "mmulti.h" #include "statistics.h" #include "gstrings.h" #include "gamestate.h" diff --git a/source/games/blood/src/hudsprites.cpp b/source/games/blood/src/hudsprites.cpp index 4da7c641056..bb0f4a31111 100644 --- a/source/games/blood/src/hudsprites.cpp +++ b/source/games/blood/src/hudsprites.cpp @@ -27,7 +27,6 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. #include "compat.h" #include "build.h" -#include "mmulti.h" #include "v_font.h" #include "blood.h" diff --git a/source/games/blood/src/loadsave.cpp b/source/games/blood/src/loadsave.cpp index a8436d8a2a7..d9da35f3954 100644 --- a/source/games/blood/src/loadsave.cpp +++ b/source/games/blood/src/loadsave.cpp @@ -25,7 +25,6 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. #include #include "build.h" #include "compat.h" -#include "mmulti.h" #include "blood.h" #include "i_specialpaths.h" diff --git a/source/games/blood/src/messages.cpp b/source/games/blood/src/messages.cpp index 8ff7ad3f7fa..250dba55de5 100644 --- a/source/games/blood/src/messages.cpp +++ b/source/games/blood/src/messages.cpp @@ -23,7 +23,6 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. #include "ns.h" // Must come before everything else! #include "build.h" -#include "mmulti.h" #include "compat.h" #include "gamecontrol.h" diff --git a/source/games/blood/src/mirrors.cpp b/source/games/blood/src/mirrors.cpp index dcebacecb30..72ad38070fd 100644 --- a/source/games/blood/src/mirrors.cpp +++ b/source/games/blood/src/mirrors.cpp @@ -24,7 +24,6 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. #include "build.h" #include "automap.h" -#include "mmulti.h" #include "savegamehelp.h" #include "blood.h" diff --git a/source/games/blood/src/nnexts.cpp b/source/games/blood/src/nnexts.cpp index 35e267875ee..b1f12c070dd 100644 --- a/source/games/blood/src/nnexts.cpp +++ b/source/games/blood/src/nnexts.cpp @@ -31,7 +31,6 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. #ifdef NOONE_EXTENSIONS #include -#include "mmulti.h" #include "blood.h" #include "savegamehelp.h" diff --git a/source/games/blood/src/osdcmd.cpp b/source/games/blood/src/osdcmd.cpp index f0a2b5b5787..fbc73d9def9 100644 --- a/source/games/blood/src/osdcmd.cpp +++ b/source/games/blood/src/osdcmd.cpp @@ -25,7 +25,6 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. #include "build.h" #include "compat.h" -#include "mmulti.h" #include "blood.h" #include "mapinfo.h" diff --git a/source/games/blood/src/player.cpp b/source/games/blood/src/player.cpp index 0a87dfd1150..9fb455f95b7 100644 --- a/source/games/blood/src/player.cpp +++ b/source/games/blood/src/player.cpp @@ -27,7 +27,6 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. #include "automap.h" #include "compat.h" #include "build.h" -#include "mmulti.h" #include "blood.h" #include "gstrings.h" diff --git a/source/games/blood/src/prediction.cpp b/source/games/blood/src/prediction.cpp index b3bd4bec1ac..69403dd4380 100644 --- a/source/games/blood/src/prediction.cpp +++ b/source/games/blood/src/prediction.cpp @@ -27,7 +27,6 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. #include "compat.h" #include "build.h" -#include "mmulti.h" #include "v_font.h" #include "blood.h" diff --git a/source/games/blood/src/sbar.cpp b/source/games/blood/src/sbar.cpp index e7967861c29..4f9621f87a2 100644 --- a/source/games/blood/src/sbar.cpp +++ b/source/games/blood/src/sbar.cpp @@ -27,7 +27,6 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. #include "compat.h" #include "build.h" -#include "mmulti.h" #include "v_font.h" #include "blood.h" diff --git a/source/games/blood/src/triggers.cpp b/source/games/blood/src/triggers.cpp index 4d46e1f0779..5bc3c10b093 100644 --- a/source/games/blood/src/triggers.cpp +++ b/source/games/blood/src/triggers.cpp @@ -26,7 +26,6 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. #include "build.h" #include "compat.h" -#include "mmulti.h" #include "blood.h" #include "d_net.h" diff --git a/source/games/blood/src/view.cpp b/source/games/blood/src/view.cpp index d6ee63a39bb..13c661af008 100644 --- a/source/games/blood/src/view.cpp +++ b/source/games/blood/src/view.cpp @@ -27,7 +27,6 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. #include "compat.h" #include "build.h" -#include "mmulti.h" #include "v_font.h" #include "blood.h" diff --git a/source/games/blood/src/weapon.cpp b/source/games/blood/src/weapon.cpp index 3d4bb9ca140..1127a82c056 100644 --- a/source/games/blood/src/weapon.cpp +++ b/source/games/blood/src/weapon.cpp @@ -27,7 +27,6 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. #include #include "compat.h" #include "build.h" -#include "mmulti.h" #include "blood.h" diff --git a/source/games/duke/src/actors_r.cpp b/source/games/duke/src/actors_r.cpp index 8403bb23cbf..76fcc717079 100644 --- a/source/games/duke/src/actors_r.cpp +++ b/source/games/duke/src/actors_r.cpp @@ -29,7 +29,6 @@ Prepared for public release: 03/21/2003 - Charlie Wiederhold, 3D Realms #include "ns.h" #include "global.h" #include "names_r.h" -#include "mmulti.h" #include "mapinfo.h" #include "dukeactor.h" diff --git a/source/games/duke/src/gamevar.cpp b/source/games/duke/src/gamevar.cpp index 95a031ab30a..c488304909d 100644 --- a/source/games/duke/src/gamevar.cpp +++ b/source/games/duke/src/gamevar.cpp @@ -37,7 +37,6 @@ source as it is released. #include "serializer.h" #include "names.h" #include "build.h" -#include "mmulti.h" #include "gamevar.h" #include "mapinfo.h" diff --git a/source/games/duke/src/global.h b/source/games/duke/src/global.h index d492d754e4c..9e101fb4fc1 100644 --- a/source/games/duke/src/global.h +++ b/source/games/duke/src/global.h @@ -3,7 +3,6 @@ #include "build.h" #include "compat.h" #include "duke3d.h" -#include "mmulti.h" #include "quotemgr.h" #include "sounds.h" #include "constants.h" diff --git a/source/games/exhumed/src/cheats.cpp b/source/games/exhumed/src/cheats.cpp index 27f4872c25d..0dc38b8982a 100644 --- a/source/games/exhumed/src/cheats.cpp +++ b/source/games/exhumed/src/cheats.cpp @@ -39,7 +39,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. #include "d_protocol.h" #include "gstrings.h" #include "aistuff.h" -#include "mmulti.h" +#include "d_net.h" BEGIN_PS_NS diff --git a/source/games/exhumed/src/map.cpp b/source/games/exhumed/src/map.cpp index 0cd8a570f43..80d7357cca5 100644 --- a/source/games/exhumed/src/map.cpp +++ b/source/games/exhumed/src/map.cpp @@ -23,7 +23,6 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. #include "view.h" #include "v_2ddrawer.h" #include "automap.h" -#include "mmulti.h" #include "v_draw.h" BEGIN_PS_NS diff --git a/source/games/exhumed/src/osdcmds.cpp b/source/games/exhumed/src/osdcmds.cpp index 81efd81e824..469843e2244 100644 --- a/source/games/exhumed/src/osdcmds.cpp +++ b/source/games/exhumed/src/osdcmds.cpp @@ -31,7 +31,6 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. #include "cheathandler.h" #include "gamestate.h" #include "gamefuncs.h" -#include "mmulti.h" BEGIN_PS_NS diff --git a/source/games/exhumed/src/save.cpp b/source/games/exhumed/src/save.cpp index 8046808f664..de96ac1067b 100644 --- a/source/games/exhumed/src/save.cpp +++ b/source/games/exhumed/src/save.cpp @@ -22,7 +22,6 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. #include "raze_music.h" #include "engine.h" #include "exhumed.h" -#include "mmulti.h" #include "savegamehelp.h" #include "sound.h" #include "mapinfo.h" diff --git a/source/games/exhumed/src/sound.cpp b/source/games/exhumed/src/sound.cpp index 5f80bf79c4f..3504bc2f66b 100644 --- a/source/games/exhumed/src/sound.cpp +++ b/source/games/exhumed/src/sound.cpp @@ -16,7 +16,6 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ //------------------------------------------------------------------------- #include "ns.h" -#include "mmulti.h" #include "compat.h" #include "build.h" #include "engine.h" diff --git a/source/games/sw/src/game.h b/source/games/sw/src/game.h index 0b950d29b6c..c574f6116f8 100644 --- a/source/games/sw/src/game.h +++ b/source/games/sw/src/game.h @@ -38,7 +38,7 @@ Prepared for public release: 03/28/2005 - Charlie Wiederhold, 3D Realms #include "build.h" #include "compat.h" -#include "mmulti.h" +#include "d_net.h" #include "mytypes.h" #include "sounds.h" diff --git a/source/games/sw/src/network.cpp b/source/games/sw/src/network.cpp index e449f675411..ac9592e1970 100644 --- a/source/games/sw/src/network.cpp +++ b/source/games/sw/src/network.cpp @@ -26,7 +26,6 @@ Prepared for public release: 03/28/2005 - Charlie Wiederhold, 3D Realms #include "ns.h" #include "build.h" -#include "mmulti.h" #include "gamecontrol.h"