Cleanup

Author: electricbrass

client/sdl/i_main.cpp

@@ -75,8 +75,6 @@
 
 EXTERN_CVAR (r_centerwindow)
 
-DArgs Args;
-
 // functions to be called at shutdown are stored in this stack
 typedef void (STACK_ARGS *term_func_t)(void);
 std::stack< std::pair<term_func_t, std::string> > TermFuncs;

client/src/cl_game.cpp

@@ -111,7 +111,6 @@ EXTERN_CVAR (chasedemo)
 gameaction_t	gameaction;
 gamestate_t 	gamestate = GS_STARTUP;
 
-bool 			paused;
 bool 			sendpause;				// send a pause event next tic
 bool			sendsave;				// send a save event next tic
 bool 			usergame;				// ok to save / end game

client/src/cl_level.cpp

@@ -79,7 +79,6 @@ dtime_t starttime;
 FLZOMemFile	*reset_snapshot = NULL;
 
 extern bool r_underwater;
-bool savegamerestore;
 
 extern int mousex, mousey, joyforward, joystrafe, joyturn, joylook, Impulse;
 extern bool sendpause, sendsave, sendcenterview;

client/src/d_main.cpp

@@ -108,10 +108,10 @@ extern bool M_DemoNoPlay;	// [RH] if true, then skip any demos in the loop
 extern DThinker ThinkerCap;
 extern dyncolormap_t NormalLight;
 
-bool devparm;				// started game with -devparm
 const char *D_DrawIcon;			// [RH] Patch name of icon to draw on next refresh
 static bool wiping_screen = false;
 
+bool autostart;
 bool advancedemo;
 event_t events[MAXEVENTS];
 int eventhead;

client/src/m_menu.cpp

@@ -105,8 +105,6 @@ size_t 				saveCharIndex;	// which char we're editing
 // old save description before edit
 char				saveOldString[SAVESTRINGSIZE];
 
-bool 				menuactive;
-
 int                 repeatKey;
 int                 repeatCount;
 

common/doomstat.h

@@ -40,7 +40,7 @@
 // ------------------------
 // Command line parameters.
 //
-extern	bool			devparm;		// DEBUG: launched with -devparm
+inline	bool			devparm;		// DEBUG: launched with -devparm
 
 
 // -----------------------------------------------------
@@ -103,8 +103,8 @@ EXTERN_CVAR (sv_maxplayers)
 //	status bar explicitely.
 extern	bool			statusbaractive;
 
-extern	bool			menuactive; 	// Menu overlayed?
-extern	bool			paused; 		// Game Pause?
+inline	bool			menuactive; 	// Menu overlayed?
+inline	bool			paused; 		// Game Pause?
 
 
 inline	bool			viewactive;

common/g_level.h

@@ -449,7 +449,7 @@ inline std::array<ACSWorldGlobalArray, NUM_WORLDVARS> ACS_WorldArrays;
 inline std::array<int, NUM_GLOBALVARS> ACS_GlobalVars;
 inline std::array<ACSWorldGlobalArray, NUM_GLOBALVARS> ACS_GlobalArrays;
 
-extern bool savegamerestore;
+inline bool savegamerestore;
 
 void G_InitNew(const char *mapname);
 inline void G_InitNew(const OLumpName& mapname) { G_InitNew(mapname.c_str()); }

common/m_argv.h

@@ -68,9 +68,9 @@ class DArgs : public DObject
 
 };
 
-extern DArgs Args;
+inline DArgs Args;
 
 void M_FindResponseFile(void);
 int M_GetParmValue(const char* name);
 
-extern bool DefaultsLoaded; 
+extern bool DefaultsLoaded;

server/src/d_main.cpp

@@ -90,7 +90,6 @@ extern bool gameisdead;
 extern DThinker ThinkerCap;
 extern dyncolormap_t NormalLight;
 
-bool devparm;				// started game with -devparm
 event_t events[MAXEVENTS];
 gamestate_t wipegamestate = GS_DEMOSCREEN;	// can be -1 to force a wipe
 

server/src/i_main.cpp

@@ -53,8 +53,6 @@ using namespace std;
 
 void AddCommandString(std::string cmd);
 
-DArgs Args;
-
 #ifdef _WIN32
 extern UINT TimerPeriod;
 #endif

server/src/sv_game.cpp

@@ -59,7 +59,6 @@ EXTERN_CVAR (sv_teamsinplay)
 gameaction_t	gameaction;
 gamestate_t 	gamestate = GS_STARTUP;
 
-bool 			paused;
 bool 			sendpause;				// send a pause event next tic
 
 bool			timingdemo; 			// FIXME : delete this variable for odasrv ?

server/src/sv_level.cpp

@@ -82,8 +82,6 @@ FLZOMemFile	*reset_snapshot = NULL;
 
 bool firstmapinit = true; // Nes - Avoid drawing same init text during every rebirth in single-player servers.
 
-bool savegamerestore;
-
 extern bool sendpause;
 
 

server/src/sv_stubs.cpp

@@ -28,8 +28,6 @@
 #include "d_player.h"
 #include "v_palette.h"
 
-bool menuactive;
-
 void R_ExitLevel() {}
 void D_SetupUserInfo (void) {}
 void D_UserInfoChanged (cvar_t *cvar) {}

tests/unit-tests/src/teststubs.cpp tests/unit-tests/src/t_stubs.cpp

@@ -51,17 +51,12 @@ void P_ShowSpawns(MapThing*) {}
 void G_DeathMatchSpawnPlayer(player_t&) {}
 player_t& consoleplayer() { static player_t fake{}; return fake; }
 player_t& displayplayer() { static player_t fake{}; return fake; }
-DArgs Args;
 bool clientside;
 bool isFast;
 bool timingdemo;
 bool demoplayback;
-bool devparm;
-bool paused;
-bool menuactive;
 bool step_mode;
 int gametic;
-bool savegamerestore;
 bool simulated_connection;
 
 void BuildDefaultShademap(palette_t const *, shademap_t &) {}