diff --git a/source/sw/src/game.cpp b/source/sw/src/game.cpp index 36fa55a72..2d8d453ea 100644 --- a/source/sw/src/game.cpp +++ b/source/sw/src/game.cpp @@ -181,7 +181,6 @@ short HelpPage = 0; short HelpPagePic[] = { 5115, 5116, 5117 }; SWBOOL InputMode = FALSE; SWBOOL MessageInput = FALSE; -extern SWBOOL GamePaused; short screenpeek = 0; SWBOOL NoDemoStartup = FALSE; SWBOOL FirstTimeIntoGame; @@ -2989,13 +2988,11 @@ FunctionKeys(PLAYERp pp) } } } - - } void PauseKey(PLAYERp pp) { - extern SWBOOL GamePaused,CheatInputMode; + extern SWBOOL CheatInputMode; if (inputState.GetKeyStatus(sc_Pause) && !CommEnabled && !InputMode && !M_Active() && !CheatInputMode && !ConPanel) { diff --git a/source/sw/src/game.h b/source/sw/src/game.h index 5a325d61e..f299112e2 100644 --- a/source/sw/src/game.h +++ b/source/sw/src/game.h @@ -2315,6 +2315,8 @@ extern char ds[]; extern short Skill; extern int GodMode; +extern SWBOOL ReloadPrompt; + extern int x_min_bound, y_min_bound, x_max_bound, y_max_bound; //extern unsigned char synctics, lastsynctics; @@ -2381,6 +2383,7 @@ void sendlogoff(void); extern int ototalclock, save_totalclock, gotlastpacketclock,smoothratio; extern SWBOOL ready2send; +extern SWBOOL GamePaused; // local copy of variables updated by faketimerhandler extern int locselectedgun; diff --git a/source/sw/src/panel.cpp b/source/sw/src/panel.cpp index 58721711e..837b62b3f 100644 --- a/source/sw/src/panel.cpp +++ b/source/sw/src/panel.cpp @@ -6224,8 +6224,6 @@ pChopsShake(PANEL_SPRITEp psp) void pChopsWait(PANEL_SPRITEp psp) { - //extern SWBOOL GamePaused; - //if (!GamePaused && RANDOM_P2(1024) < 10) if (RANDOM_P2(1024) < 10) { diff --git a/source/sw/src/player.cpp b/source/sw/src/player.cpp index 758321d2a..98dc621df 100644 --- a/source/sw/src/player.cpp +++ b/source/sw/src/player.cpp @@ -7803,7 +7803,6 @@ void PauseMultiPlay(void) static SWBOOL SavePrediction; PLAYERp pp; short pnum,p; - extern SWBOOL GamePaused; // check for pause of multi-play game TRAVERSE_CONNECT(pnum) @@ -7858,10 +7857,9 @@ domovethings(void) extern SWBOOL DebugActorFreeze; extern int PlayClock; short i, pnum; - extern SWBOOL GamePaused; + PLAYERp pp; extern unsigned int MoveThingsCount; - extern SWBOOL ReloadPrompt; extern int FinishTimer; diff --git a/source/sw/src/predict.cpp b/source/sw/src/predict.cpp index 8314f9a30..f6bd190b4 100644 --- a/source/sw/src/predict.cpp +++ b/source/sw/src/predict.cpp @@ -56,8 +56,6 @@ int predictmovefifoplc; void DoPlayerSectorUpdatePreMove(PLAYERp); void DoPlayerSectorUpdatePostMove(PLAYERp); -extern SWBOOL GamePaused; - #define PREDICT_DEBUG 0 #if PREDICT_DEBUG diff --git a/source/sw/src/quake.cpp b/source/sw/src/quake.cpp index 5c9bffafb..5dbafad17 100644 --- a/source/sw/src/quake.cpp +++ b/source/sw/src/quake.cpp @@ -53,8 +53,6 @@ BEGIN_SW_NS // only for timed quakes #define QUAKE_WaitForTrigger(sp) (TEST_BOOL3(sp)) -extern SWBOOL GamePaused; - short CopyQuakeSpotToOn(SPRITEp sp) { short New; diff --git a/source/sw/src/vis.cpp b/source/sw/src/vis.cpp index 25fc2ee68..2b9415ab9 100644 --- a/source/sw/src/vis.cpp +++ b/source/sw/src/vis.cpp @@ -38,7 +38,6 @@ Prepared for public release: 03/28/2005 - Charlie Wiederhold, 3D Realms BEGIN_SW_NS extern short NormalVisibility; // player.c -extern SWBOOL GamePaused; #define VIS_VisCur(sp) (SP_TAG2(sp)) #define VIS_VisDir(sp) (SP_TAG3(sp))