Skip to content

Commit

Permalink
- merged the few remaining contents of mmulti.h into d_net.h
Browse files Browse the repository at this point in the history
  • Loading branch information
@coelckers
coelckers committed May 3, 2021
1 parent 6589222 commit 7d77b23
Show file tree
Hide file tree
Showing 57 changed files with 8 additions and 74 deletions.
19 changes: 0 additions & 19 deletions source/build/include/mmulti.h
View file

This file was deleted.

1 change: 0 additions & 1 deletion source/core/cheats.cpp
View file
Expand Up @@ -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"
Expand Down
1 change: 0 additions & 1 deletion source/core/d_net.cpp
View file
Expand Up @@ -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"
Expand Down
3 changes: 3 additions & 0 deletions source/core/d_net.h
View file
Expand Up @@ -10,6 +10,9 @@ enum
MAXPLAYERS = 8
};

extern int myconnectindex, numplayers;
extern int connecthead, connectpoint2[MAXPLAYERS];

class FDynamicBuffer
{
public:
Expand Down
3 changes: 1 addition & 2 deletions source/core/gamecontrol.cpp
View file
Expand Up @@ -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"
Expand Down Expand Up @@ -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;

Expand Down
1 change: 0 additions & 1 deletion source/core/mainloop.cpp
View file
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion source/core/savegamehelp.cpp
View file
Expand Up @@ -59,6 +59,7 @@
#include "render.h"
#include "hw_sections.h"
#include "sectorgeometry.h"
#include "d_net.h"
#include <zlib.h>


Expand Down Expand Up @@ -422,7 +423,6 @@ FString G_BuildSaveName (const char *prefix)
}

#include "build.h"
#include "mmulti.h"

#define V(x) x
static spritetype zsp;
Expand Down
1 change: 0 additions & 1 deletion source/games/blood/src/actor.cpp
View file
Expand Up @@ -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"
Expand Down
1 change: 0 additions & 1 deletion source/games/blood/src/ai.cpp
View file
Expand Up @@ -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"

Expand Down
1 change: 0 additions & 1 deletion source/games/blood/src/aibat.cpp
View file
Expand Up @@ -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"

Expand Down
1 change: 0 additions & 1 deletion source/games/blood/src/aibeast.cpp
View file
Expand Up @@ -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"

Expand Down
1 change: 0 additions & 1 deletion source/games/blood/src/aiboneel.cpp
View file
Expand Up @@ -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"

Expand Down
1 change: 0 additions & 1 deletion source/games/blood/src/aiburn.cpp
View file
Expand Up @@ -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"

Expand Down
1 change: 0 additions & 1 deletion source/games/blood/src/aicaleb.cpp
View file
Expand Up @@ -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"

Expand Down
1 change: 0 additions & 1 deletion source/games/blood/src/aicerber.cpp
View file
Expand Up @@ -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"

Expand Down
1 change: 0 additions & 1 deletion source/games/blood/src/aicult.cpp
View file
Expand Up @@ -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"

Expand Down
1 change: 0 additions & 1 deletion source/games/blood/src/aigarg.cpp
View file
Expand Up @@ -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"

Expand Down
1 change: 0 additions & 1 deletion source/games/blood/src/aighost.cpp
View file
Expand Up @@ -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"

Expand Down
1 change: 0 additions & 1 deletion source/games/blood/src/aigilbst.cpp
View file
Expand Up @@ -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"

Expand Down
1 change: 0 additions & 1 deletion source/games/blood/src/aihand.cpp
View file
Expand Up @@ -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"

Expand Down
1 change: 0 additions & 1 deletion source/games/blood/src/aihound.cpp
View file
Expand Up @@ -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"

Expand Down
1 change: 0 additions & 1 deletion source/games/blood/src/aiinnoc.cpp
View file
Expand Up @@ -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"

Expand Down
1 change: 0 additions & 1 deletion source/games/blood/src/aipod.cpp
View file
Expand Up @@ -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"

Expand Down
1 change: 0 additions & 1 deletion source/games/blood/src/airat.cpp
View file
Expand Up @@ -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"

Expand Down
1 change: 0 additions & 1 deletion source/games/blood/src/aispid.cpp
View file
Expand Up @@ -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"

Expand Down
1 change: 0 additions & 1 deletion source/games/blood/src/aitchern.cpp
View file
Expand Up @@ -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"

Expand Down
1 change: 0 additions & 1 deletion source/games/blood/src/aiunicult.cpp
View file
Expand Up @@ -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"
Expand Down
1 change: 0 additions & 1 deletion source/games/blood/src/aizomba.cpp
View file
Expand Up @@ -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"

Expand Down
1 change: 0 additions & 1 deletion source/games/blood/src/aizombf.cpp
View file
Expand Up @@ -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"

Expand Down
1 change: 0 additions & 1 deletion source/games/blood/src/animatesprite.cpp
View file
Expand Up @@ -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"
Expand Down
1 change: 0 additions & 1 deletion source/games/blood/src/blood.cpp
View file
Expand Up @@ -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"
Expand Down
1 change: 1 addition & 0 deletions source/games/blood/src/blood.h
View file
Expand Up @@ -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"
Expand Down
1 change: 0 additions & 1 deletion source/games/blood/src/controls.cpp
View file
Expand Up @@ -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"
Expand Down
1 change: 0 additions & 1 deletion source/games/blood/src/d_menu.cpp
View file
Expand Up @@ -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"
Expand Down
1 change: 0 additions & 1 deletion source/games/blood/src/endgame.cpp
View file
Expand Up @@ -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"
Expand Down
1 change: 0 additions & 1 deletion source/games/blood/src/hudsprites.cpp
View file
Expand Up @@ -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"
Expand Down
1 change: 0 additions & 1 deletion source/games/blood/src/loadsave.cpp
View file
Expand Up @@ -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"
Expand Down
1 change: 0 additions & 1 deletion source/games/blood/src/messages.cpp
View file
Expand Up @@ -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"

Expand Down
1 change: 0 additions & 1 deletion source/games/blood/src/mirrors.cpp
View file
Expand Up @@ -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"
Expand Down
1 change: 0 additions & 1 deletion source/games/blood/src/nnexts.cpp
View file
Expand Up @@ -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"

Expand Down
1 change: 0 additions & 1 deletion source/games/blood/src/osdcmd.cpp
View file
Expand Up @@ -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"
Expand Down
1 change: 0 additions & 1 deletion source/games/blood/src/player.cpp
View file
Expand Up @@ -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"
Expand Down
1 change: 0 additions & 1 deletion source/games/blood/src/prediction.cpp
View file
Expand Up @@ -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"
Expand Down
1 change: 0 additions & 1 deletion source/games/blood/src/sbar.cpp
View file
Expand Up @@ -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"
Expand Down
1 change: 0 additions & 1 deletion source/games/blood/src/triggers.cpp
View file
Expand Up @@ -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"
Expand Down
1 change: 0 additions & 1 deletion source/games/blood/src/view.cpp
View file
Expand Up @@ -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"
Expand Down

0 comments on commit 7d77b23

Please sign in to comment.