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
This commit is contained in:
terminx 2018-10-16 06:08:50 +00:00
parent e9797fe24d
commit af728b2641
8 changed files with 14 additions and 38 deletions

View file

@ -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) #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; int32_t otherp;
int G_SetInterpolation(int32_t *const posptr) int G_SetInterpolation(int32_t *const posptr)
@ -52,7 +49,7 @@ int G_SetInterpolation(int32_t *const posptr)
return 0; 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) for (bssize_t i = 0; i < g_interpolationCnt; ++i)
if (curipos[i] == posptr) if (curipos[i] == posptr)

View file

@ -60,11 +60,6 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
# include "lunatic_editor.h" # include "lunatic_editor.h"
#endif #endif
extern const char *s_buildRev;
extern const char *s_buildTimestamp;
extern int32_t globalpal;
#include <signal.h> #include <signal.h>
// Workaround for namespace pollution in <sys/stat.h> introduced in MinGW 4.8. // Workaround for namespace pollution in <sys/stat.h> introduced in MinGW 4.8.
@ -309,7 +304,7 @@ extern int32_t mskip;
//extern int32_t fillsector(int16_t sectnum, char fillcolor); //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) #define M32_NUM_SPRITE_MODES (signed)ARRAY_SIZE(SpriteMode)

View file

@ -258,7 +258,7 @@ int32_t A_CheckInventorySprite(spritetype *s)
} }
} }
extern int32_t g_doQuickSave;
void G_GameExit(const char *msg) 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); 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); Bfree((void *)key);
} }

View file

@ -73,8 +73,6 @@ static char *textptr;
int32_t g_errorCnt,g_warningCnt; int32_t g_errorCnt,g_warningCnt;
extern int32_t g_highestSoundIdx;
#if !defined LUNATIC #if !defined LUNATIC
static char *C_GetLabelType(int32_t type) static char *C_GetLabelType(int32_t type)
{ {
@ -6552,9 +6550,6 @@ void C_InitProjectiles(void)
} }
#if !defined LUNATIC #if !defined LUNATIC
extern int32_t g_numObituaries;
extern int32_t g_numSelfObituaries;
static char const * C_ScriptVersionString(int32_t version) static char const * C_ScriptVersionString(int32_t version)
{ {
switch (version) switch (version)

View file

@ -56,7 +56,7 @@ uint32_t m32_drawlinepat=0xffffffff;
int32_t m32_script_expertmode = 0; int32_t m32_script_expertmode = 0;
instype *insptr; instype *insptr;
int32_t VM_Execute(int32_t once);
static instype *x_sortingstateptr; static instype *x_sortingstateptr;
//#include "m32structures.cpp" //#include "m32structures.cpp"

View file

@ -43,8 +43,6 @@ droidinput_t droidinput;
int32_t g_skillSoundVoice = -1; int32_t g_skillSoundVoice = -1;
extern int32_t voting;
#define USERMAPENTRYLENGTH 25 #define USERMAPENTRYLENGTH 25
static FORCE_INLINE void Menu_StartTextInput() 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); Menu_DrawCursorTextTile(x, y, h, SPINNINGNUKEICON+((totalclock>>3)%7), siz, ydim_upper, ydim_lower);
} }
extern int32_t g_quitDeadline;
static size_t g_oldSaveCnt; static size_t g_oldSaveCnt;
/* /*
All MAKE_* macros are generally for the purpose of keeping state initialization All MAKE_* macros are generally for the purpose of keeping state initialization
separate from actual data. Alternatively, they can serve to factor out repetitive 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; 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 void Menu_EntryFocus(/*MenuEntry_t *entry*/);
static MenuEntry_t *Menu_AdjustForCurrentEntryAssignment(MenuMenu_t *menu) static MenuEntry_t *Menu_AdjustForCurrentEntryAssignment(MenuMenu_t *menu)

View file

@ -35,7 +35,6 @@ static int32_t g_whichPalForPlayer = 9;
static uint8_t precachehightile[2][MAXTILES>>3]; 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) 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) void G_CacheMapData(void)
{ {

View file

@ -41,10 +41,10 @@ uint32_t dq[DQSIZE];
void S_SoundStartup(void) void S_SoundStartup(void)
{ {
void *initdata = NULL;
#ifdef MIXERTYPEWIN #ifdef MIXERTYPEWIN
initdata = (void *) win_gethwnd(); // used for DirectSound void *initdata = (void *) win_gethwnd(); // used for DirectSound
#else
void *initdata = NULL;
#endif #endif
initprintf("Initializing sound... "); initprintf("Initializing sound... ");