More cleanup

Author: electricbrass

client/src/cl_game.cpp

@@ -108,7 +108,6 @@ EXTERN_CVAR (in_autosr50)
 
 EXTERN_CVAR (chasedemo)
 
-gameaction_t	gameaction;
 gamestate_t 	gamestate = GS_STARTUP;
 
 bool 			sendpause;				// send a pause event next tic
@@ -120,8 +119,6 @@ bool			longtics;				// don't quantize yaw for classic vanilla demos
 bool 			nodrawers;				// for comparative timing purposes
 bool 			noblit; 				// for comparative timing purposes
 
-byte			consoleplayer_id;			// player taking events and displaying
-byte			displayplayer_id;			// view being displayed
 int 			gametic;
 
 extern fixed_t bobx;
@@ -187,7 +184,6 @@ CVAR_FUNC_IMPL(cl_mouselook)
 }
 
 char			demoname[256];
-bool 			demoplayback;
 
 extern bool		simulated_connection;
 

common/d_event.h

@@ -1,4 +1,4 @@
-// Emacs style mode select   -*- C++ -*- 
+// Emacs style mode select   -*- C++ -*-
 //-----------------------------------------------------------------------------
 //
 // $Id$
@@ -18,7 +18,7 @@
 //
 // DESCRIPTION:
 //	Input event handling (?)
-//    
+//
 //-----------------------------------------------------------------------------
 
 #pragma once
@@ -63,7 +63,7 @@ struct event_t
 	int			mod;				// input mods
 };
 
- 
+
 typedef enum
 {
 	ga_nothing,
@@ -96,7 +96,7 @@ typedef enum
 	// Flag: game events, not really buttons.
 	BT_SPECIAL			= 128,
 	BT_SPECIALMASK		= 3,
-	
+
 	// Flag, weapon change pending.
 	// If true, the next 3 bits hold weapon num.
 	BT_CHANGE			= 4,
@@ -112,10 +112,10 @@ typedef enum
 	BTS_SAVEGAME		= 2,
 
 	// Savegame slot numbers
-	//	occupy the second byte of buttons.	  
+	//	occupy the second byte of buttons.
 	BTS_SAVEMASK		= (4+8+16),
 	BTS_SAVESHIFT		= 2
-  
+
 } buttoncode_t;
 
 
@@ -130,4 +130,4 @@ extern	event_t 		events[MAXEVENTS];
 extern	int 			eventhead;
 extern	int 			eventtail;
 
-extern	gameaction_t	gameaction;
+inline	gameaction_t	gameaction;

common/d_player.h

@@ -644,8 +644,8 @@ size_t P_NumPlayersInGame();
 size_t P_NumReadyPlayersInGame();
 size_t P_NumPlayersOnTeam(team_t team);
 
-extern byte consoleplayer_id;
-extern byte displayplayer_id;
+inline byte consoleplayer_id; // player taking events and displaying
+inline byte displayplayer_id; // view being displayed
 
 //
 

common/doomstat.h

@@ -127,7 +127,7 @@ extern level_locals_t level;
 // Disable save/end game?
 extern	bool			usergame;
 
-extern	bool			demoplayback;
+inline	bool			demoplayback;
 
 // Quit after playing a demo from cmdline.
 extern	bool			singledemo;

common/p_boomfspec.h

@@ -60,5 +60,3 @@ void P_SpawnFireFlicker(sector_t* sector);
 AActor* P_GetPushThing(int);
 void P_PostProcessCompatibleLinedefSpecial(line_t* line);
 bool P_IsTeleportLine(const short special);
-
-extern bool demoplayback;

server/src/sv_game.cpp

@@ -56,20 +56,15 @@ EXTERN_CVAR (sv_fastmonsters)
 EXTERN_CVAR (sv_freelook)
 EXTERN_CVAR (sv_teamsinplay)
 
-gameaction_t	gameaction;
 gamestate_t 	gamestate = GS_STARTUP;
 
 bool 			sendpause;				// send a pause event next tic
 
 player_t		nullplayer;				// The null player
 
-byte			consoleplayer_id;		// player taking events and displaying
-byte			displayplayer_id;		// view being displayed
 int 			gametic;
 
-
 FILE			*recorddemo_fp;			// Ch0wW : Keeping this for future serverside demo-recording.
-bool 			demoplayback;			// FIXME : remove this serverside !
 int				demostartgametic;		// FIXME : remove this serverside !
 
 wbstartstruct_t wminfo; 				// parms for world map / intermission

tests/unit-tests/src/t_stubs.cpp

@@ -40,18 +40,13 @@ bool clientside = false; // don't want any rendering code called
 bool serverside = true;
 baseapp_t baseapp = test;
 
-// Unnatural Level Progression.  True if we've used 'map' or another command
-// to switch to a specific map out of order, otherwise false.
-bool unnatural_level_progression;
-unsigned char consoleplayer_id;
+bool unnatural_level_progression = false;
+bool step_mode = false;
 wbstartstruct_t wminfo;
-gameaction_t gameaction;
+
 bool predicting;
 int demostartgametic;
-
 bool isFast;
-bool demoplayback;
-bool step_mode;
 int gametic;
 bool simulated_connection;
 gamestate_t gamestate;
@@ -127,19 +122,10 @@ void V_RefreshColormaps() {}
 
 size_t C_BasePrint(const int printlevel, const char* color_code, const std::string& str) { return 0; }
 
-#define NORM_PITCH				128
-#define NORM_PRIORITY			64
-#define NORM_SEP				128
-
-#define S_PITCH_PERTURB 		1
-#define S_STEREO_SWING			(96<<FRACBITS)
-
 //
 // [RH] Print sound debug info. Called from D_Display()
 //
-void S_NoiseDebug()
-{
-}
+void S_NoiseDebug() {}
 
 
 //