From af728b26414ef8e52b14a0e05a0fff368e4eed4b Mon Sep 17 00:00:00 2001 From: terminx Date: Tue, 16 Oct 2018 06:08:50 +0000 Subject: [PATCH] Remove a few useless forward declarations and const-ify a couple of function parameters. Yawn. git-svn-id: https://svn.eduke32.com/eduke32@7070 1a8010ca-5511-0410-912e-c29ae57300e0 --- source/duke3d/src/actors.cpp | 5 +---- source/duke3d/src/astub.cpp | 7 +------ source/duke3d/src/game.cpp | 6 +++--- source/duke3d/src/gamedef.cpp | 5 ----- source/duke3d/src/m32exec.cpp | 2 +- source/duke3d/src/menus.cpp | 14 ++------------ source/duke3d/src/premap.cpp | 7 +++---- source/duke3d/src/sounds.cpp | 6 +++--- 8 files changed, 14 insertions(+), 38 deletions(-) diff --git a/source/duke3d/src/actors.cpp b/source/duke3d/src/actors.cpp index 6023a3d6f..ab59aed88 100644 --- a/source/duke3d/src/actors.cpp +++ b/source/duke3d/src/actors.cpp @@ -32,9 +32,6 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. #define DELETE_SPRITE_AND_CONTINUE(KX) do { A_DeleteSprite(KX); goto next_sprite; } while (0) -extern int32_t g_numEnvSoundsPlaying; -extern int32_t g_noEnemies; - int32_t otherp; int G_SetInterpolation(int32_t *const posptr) @@ -52,7 +49,7 @@ int G_SetInterpolation(int32_t *const posptr) return 0; } -void G_StopInterpolation(int32_t * const posptr) +void G_StopInterpolation(const int32_t * const posptr) { for (bssize_t i = 0; i < g_interpolationCnt; ++i) if (curipos[i] == posptr) diff --git a/source/duke3d/src/astub.cpp b/source/duke3d/src/astub.cpp index d91aca543..9db934cbf 100644 --- a/source/duke3d/src/astub.cpp +++ b/source/duke3d/src/astub.cpp @@ -60,11 +60,6 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. # include "lunatic_editor.h" #endif -extern const char *s_buildRev; -extern const char *s_buildTimestamp; - -extern int32_t globalpal; - #include // Workaround for namespace pollution in introduced in MinGW 4.8. @@ -309,7 +304,7 @@ extern int32_t mskip; //extern int32_t fillsector(int16_t sectnum, char fillcolor); -static int32_t osdcmd_quit(osdfuncparm_t const * const parm); +static int32_t osdcmd_quit(osdfuncparm_t const * parm); #define M32_NUM_SPRITE_MODES (signed)ARRAY_SIZE(SpriteMode) diff --git a/source/duke3d/src/game.cpp b/source/duke3d/src/game.cpp index a1763dc28..088307c45 100644 --- a/source/duke3d/src/game.cpp +++ b/source/duke3d/src/game.cpp @@ -258,7 +258,7 @@ int32_t A_CheckInventorySprite(spritetype *s) } } -extern int32_t g_doQuickSave; + void G_GameExit(const char *msg) { @@ -5122,7 +5122,7 @@ static void parsedefinitions_game_include(const char *fileName, scriptfile *pScr } } -static void parsedefinitions_game_animsounds(scriptfile *pScript, char * blockEnd, char const * fileName, dukeanim_t * animPtr) +static void parsedefinitions_game_animsounds(scriptfile *pScript, const char * blockEnd, char const * fileName, dukeanim_t * animPtr) { Bfree(animPtr->sounds); @@ -5519,7 +5519,7 @@ void G_UpdateAppTitle(void) } } -static void G_FreeHashAnim(const char *UNUSED(string), intptr_t key) +static void G_FreeHashAnim(const char * /*string*/, intptr_t key) { Bfree((void *)key); } diff --git a/source/duke3d/src/gamedef.cpp b/source/duke3d/src/gamedef.cpp index 8d5f282a6..688baabc4 100644 --- a/source/duke3d/src/gamedef.cpp +++ b/source/duke3d/src/gamedef.cpp @@ -73,8 +73,6 @@ static char *textptr; int32_t g_errorCnt,g_warningCnt; -extern int32_t g_highestSoundIdx; - #if !defined LUNATIC static char *C_GetLabelType(int32_t type) { @@ -6552,9 +6550,6 @@ void C_InitProjectiles(void) } #if !defined LUNATIC -extern int32_t g_numObituaries; -extern int32_t g_numSelfObituaries; - static char const * C_ScriptVersionString(int32_t version) { switch (version) diff --git a/source/duke3d/src/m32exec.cpp b/source/duke3d/src/m32exec.cpp index 9883ccd4f..ebd56909a 100644 --- a/source/duke3d/src/m32exec.cpp +++ b/source/duke3d/src/m32exec.cpp @@ -56,7 +56,7 @@ uint32_t m32_drawlinepat=0xffffffff; int32_t m32_script_expertmode = 0; instype *insptr; -int32_t VM_Execute(int32_t once); + static instype *x_sortingstateptr; //#include "m32structures.cpp" diff --git a/source/duke3d/src/menus.cpp b/source/duke3d/src/menus.cpp index e123f5978..556c9788b 100644 --- a/source/duke3d/src/menus.cpp +++ b/source/duke3d/src/menus.cpp @@ -43,8 +43,6 @@ droidinput_t droidinput; int32_t g_skillSoundVoice = -1; -extern int32_t voting; - #define USERMAPENTRYLENGTH 25 static FORCE_INLINE void Menu_StartTextInput() @@ -174,20 +172,12 @@ static void Menu_DrawCursorText(int32_t x, int32_t y, int32_t h, int32_t ydim_up Menu_DrawCursorTextTile(x, y, h, SPINNINGNUKEICON+((totalclock>>3)%7), siz, ydim_upper, ydim_lower); } -extern int32_t g_quitDeadline; + static size_t g_oldSaveCnt; - - - - - - - - /* All MAKE_* macros are generally for the purpose of keeping state initialization separate from actual data. Alternatively, they can serve to factor out repetitive @@ -1573,7 +1563,7 @@ static void MenuEntry_HideOnCondition(MenuEntry_t * const entry, const int32_t c entry->flags &= ~MEF_Hidden; } -static int32_t M_RunMenu_Menu(Menu_t *cm, MenuMenu_t *menu, MenuEntry_t *currentry, int32_t state, const vec2_t origin, bool actually_draw = true); +static int32_t M_RunMenu_Menu(Menu_t *cm, MenuMenu_t *menu, MenuEntry_t *currentry, int32_t state, vec2_t origin, bool actually_draw = true); static void Menu_EntryFocus(/*MenuEntry_t *entry*/); static MenuEntry_t *Menu_AdjustForCurrentEntryAssignment(MenuMenu_t *menu) diff --git a/source/duke3d/src/premap.cpp b/source/duke3d/src/premap.cpp index 109628f4d..1203cc56b 100644 --- a/source/duke3d/src/premap.cpp +++ b/source/duke3d/src/premap.cpp @@ -33,9 +33,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. static int32_t g_whichPalForPlayer = 9; static uint8_t precachehightile[2][MAXTILES>>3]; -static int32_t g_precacheCount; +static int32_t g_precacheCount; -extern int32_t g_levelTextTime; static void flag_precache(int32_t tile, int32_t type) { @@ -363,8 +362,8 @@ static void G_DoLoadScreen(const char *statustext, int32_t percent) } } -extern void G_SetCrosshairColor(int32_t r, int32_t g, int32_t b); -extern palette_t CrosshairColors; + + void G_CacheMapData(void) { diff --git a/source/duke3d/src/sounds.cpp b/source/duke3d/src/sounds.cpp index 55a73488e..d58e87484 100644 --- a/source/duke3d/src/sounds.cpp +++ b/source/duke3d/src/sounds.cpp @@ -41,10 +41,10 @@ uint32_t dq[DQSIZE]; void S_SoundStartup(void) { - void *initdata = NULL; - #ifdef MIXERTYPEWIN - initdata = (void *) win_gethwnd(); // used for DirectSound + void *initdata = (void *) win_gethwnd(); // used for DirectSound +#else + void *initdata = NULL; #endif initprintf("Initializing sound... ");