- merged the few remaining contents of mmulti.h into d_net.h

source/build/include/mmulti.h

@@ -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_
-

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"

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"

source/core/d_net.h

@@ -10,6 +10,9 @@ enum
 	MAXPLAYERS = 8
 };
 
+extern int myconnectindex, numplayers;
+extern int connecthead, connectpoint2[MAXPLAYERS];
+
 class FDynamicBuffer
 {
 public:

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;
 

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"

source/core/savegamehelp.cpp

@@ -59,6 +59,7 @@
 #include "render.h"
 #include "hw_sections.h"
 #include "sectorgeometry.h"
+#include "d_net.h"
 #include <zlib.h>
 
 
@@ -422,7 +423,6 @@ FString G_BuildSaveName (const char *prefix)
 }
 
 #include "build.h"
-#include "mmulti.h"
 
 #define V(x) x
 static spritetype zsp;

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"

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"
 

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"
 

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"
 

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"
 

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"
 

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"
 

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"
 

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"
 

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"
 

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"
 

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"
 

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"
 

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"
 

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"
 

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"
 

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"
 

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"
 

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"
 

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"

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"
 

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"
 

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"

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"

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"

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"

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"

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"

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"

source/games/blood/src/loadsave.cpp

@@ -25,7 +25,6 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 #include <stdio.h>
 #include "build.h"
 #include "compat.h"
-#include "mmulti.h"
 
 #include "blood.h"
 #include "i_specialpaths.h"

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"
 

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" 

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 <random>
-#include "mmulti.h"
 #include "blood.h"
 #include "savegamehelp.h"
 

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"

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"

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"

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"

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"

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"

source/games/blood/src/weapon.cpp

@@ -27,7 +27,6 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 #include <string.h>
 #include "compat.h"
 #include "build.h"
-#include "mmulti.h"
 
 #include "blood.h"
 

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"
 

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"
 

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"

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
 

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

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
 

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"

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"

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"

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"