From 03c579769c3c5ce5407545530bcb57fd6bd7086e Mon Sep 17 00:00:00 2001 From: Alug Date: Tue, 25 Nov 2025 13:15:29 +0100 Subject: [PATCH] delet some duped declarations --- src/command.c | 1 - src/d_netfil.c | 1 - src/f_finale.c | 4 +--- src/g_game.c | 6 ------ src/g_input.c | 3 +-- src/hardware/r_opengl/r_opengl.h | 1 - src/k_hud.h | 2 -- src/p_mobj.c | 1 - src/r_portal.c | 11 +++++------ src/sdl/sdlmain.h | 2 -- 10 files changed, 7 insertions(+), 25 deletions(-) diff --git a/src/command.c b/src/command.c index d12ae5d49..0cf1c85ff 100644 --- a/src/command.c +++ b/src/command.c @@ -57,7 +57,6 @@ static void CV_EnforceExecVersion(void); static boolean CV_FilterVarByVersion(consvar_t *v, const char *valstr); static boolean CV_Command(void); -consvar_t *CV_FindVar(const char *name); static const char *CV_StringValue(const char *var_name); static consvar_t *consvar_vars; // list of registered console variables diff --git a/src/d_netfil.c b/src/d_netfil.c index d80ae7b79..d35bb09b3 100644 --- a/src/d_netfil.c +++ b/src/d_netfil.c @@ -64,7 +64,6 @@ static boolean SV_SendFile(INT32 node, const char *filename, UINT8 fileid); #ifdef HAVE_CURL -size_t curlwrite_data(void *ptr, size_t size, size_t nmemb, FILE *stream); #if (LIBCURL_VERSION_MAJOR <= 7) && (LIBCURL_VERSION_MINOR < 35) static int curlprogress_callback(void *clientp, double dltotal, double dlnow, double ultotal, double ulnow); #else diff --git a/src/f_finale.c b/src/f_finale.c index 0d3f6e64d..f0d6ab5f6 100644 --- a/src/f_finale.c +++ b/src/f_finale.c @@ -215,9 +215,6 @@ static tic_t introscenetime[NUMINTROSCENES] = 4*TICRATE, // KART KR(eW }; -// custom intros -void F_StartCustomCutscene(INT32 cutscenenum, boolean precutscene, boolean resetplayer); - void F_StartIntro(void) { if (gamestate) @@ -1415,6 +1412,7 @@ void F_EndCutScene(void) } } +// custom intros void F_StartCustomCutscene(INT32 cutscenenum, boolean precutscene, boolean resetplayer) { if (!cutscenes[cutscenenum]) diff --git a/src/g_game.c b/src/g_game.c index 2bdcd0b66..a02320f66 100644 --- a/src/g_game.c +++ b/src/g_game.c @@ -276,12 +276,6 @@ UINT32 timesBeatenWithEmeralds = 0; INT16 prevmap = 0, nextmap = 0; -// Analog Control -void SendWeaponPref(void); -void SendWeaponPref2(void); -void SendWeaponPref3(void); -void SendWeaponPref4(void); - // don't mind me putting these here, I was lazy to figure out where else I could put those without blowing up the compiler. // chat timer thingy diff --git a/src/g_input.c b/src/g_input.c index 08f3e2298..a221ea1d1 100644 --- a/src/g_input.c +++ b/src/g_input.c @@ -960,8 +960,7 @@ static UINT8 curcolor[MAXSPLITSCREENPLAYERS] = {}; void G_DeviceLEDTick(void) { - UINT8 i; - static UINT8 newcolor = UINT8_MAX; + UINT8 i, newcolor; if (numcontrollers == 0) { diff --git a/src/hardware/r_opengl/r_opengl.h b/src/hardware/r_opengl/r_opengl.h index 34d4b9da3..256731083 100644 --- a/src/hardware/r_opengl/r_opengl.h +++ b/src/hardware/r_opengl/r_opengl.h @@ -69,7 +69,6 @@ extern boolean supportstencil; void *GetGLFunc(const char *proc); boolean SetupGLfunc(void); void SetupGLFunc4(void); -void GL_Flush(void); INT32 GL_isExtAvailable(const char *extension, const GLubyte *start); void GL_SetModelView(GLint w, GLint h); void GL_SetStates(void); diff --git a/src/k_hud.h b/src/k_hud.h index 167a89e6a..7504f3dc7 100644 --- a/src/k_hud.h +++ b/src/k_hud.h @@ -24,7 +24,6 @@ extern "C" { UINT8 K_GetHudColor(void); boolean K_UseColorHud(void); boolean K_UseHighResPortraits(void); -patch_t *K_GetFacePrefix(player_t *player, INT32 skinnum); void K_RegisterKartHudStuff(void); @@ -35,7 +34,6 @@ extern consvar_t cv_colorizedhud, extern consvar_t cv_darkitembox; extern consvar_t cv_biglaps; extern consvar_t cv_highresportrait; -extern consvar_t cv_stat_xoffset, cv_stat_yoffset; extern consvar_t cv_showstats; extern consvar_t cv_fancyroulette; extern consvar_t cv_showlaptimes; diff --git a/src/p_mobj.c b/src/p_mobj.c index c196315dd..143415ea2 100644 --- a/src/p_mobj.c +++ b/src/p_mobj.c @@ -5933,7 +5933,6 @@ static void P_RemoveShadow(mobj_t *thing) } } -void A_BossDeath(void *thing); // AI for the Koopa boss. static void P_KoopaThinker(mobj_t *koopa) { diff --git a/src/r_portal.c b/src/r_portal.c index 1a5c7c4a8..661034a3f 100644 --- a/src/r_portal.c +++ b/src/r_portal.c @@ -220,21 +220,20 @@ static void Portal_ClipVisplane (const visplane_t* plane, portal_t* portal) for (i = 0; i < end - start; i++) { // Invalid column. - if (plane->top[i + start] == 65535) + if (plane->top[i + start] == UINT16_MAX) { portal->ceilingclip[i] = -1; portal->floorclip[i] = -1; continue; } + portal->ceilingclip[i] = plane->top[i + start] - 1; portal->floorclip[i] = plane->bottom[i + start] + 1; portal->frontscale[i] = INT32_MAX; } } -extern INT32 viewwidth; - -static boolean TrimVisplaneBounds (const visplane_t* plane, INT16* start, INT16* end) +static boolean TrimVisplaneBounds(const visplane_t* plane, INT16* start, INT16* end) { *start = plane->minx; *end = plane->maxx + 1; @@ -255,13 +254,13 @@ static boolean TrimVisplaneBounds (const visplane_t* plane, INT16* start, INT16* * valid area. */ - while (plane->bottom[*start] == 0 && plane->top[*start] == 65535 && *start < *end) + while (plane->bottom[*start] == 0 && plane->top[*start] == UINT16_MAX && *start < *end) { (*start)++; } - while (plane->bottom[*end - 1] == 0 && plane->top[*start] == 65535 && *end > *start) + while (plane->bottom[*end - 1] == 0 && plane->top[*start] == UINT16_MAX && *end > *start) { (*end)--; } diff --git a/src/sdl/sdlmain.h b/src/sdl/sdlmain.h index 0fe93953a..c711d68d7 100644 --- a/src/sdl/sdlmain.h +++ b/src/sdl/sdlmain.h @@ -67,8 +67,6 @@ extern SDLJoyInfo_t JoyInfo[4]; //MAXSPLITSCREENPLAYERS #define SDL_JDEADZONE 153 #undef SDL_JDEADZONE -void I_GetConsoleEvents(void); - // So we can call this from i_video event loop void I_ShutdownJoystick(UINT8 index);