From 9c30e7a422d50fedceb2510e5fddcfbce9f5b8d0 Mon Sep 17 00:00:00 2001 From: NepDisk Date: Wed, 17 Sep 2025 20:55:57 -0400 Subject: [PATCH] Fix some compiler warnings AGAIN --- src/console.c | 2 +- src/k_hud.c | 6 +++--- src/k_kart.c | 8 ++++++-- 3 files changed, 10 insertions(+), 6 deletions(-) diff --git a/src/console.c b/src/console.c index 4f5d3443a..6acf3e205 100644 --- a/src/console.c +++ b/src/console.c @@ -841,7 +841,7 @@ boolean CON_Responder(event_t *ev) // check for console toggle key if (ev->type != ev_console) { - if (modeattacking && !demo.playback || metalrecording || marathonmode) + if ((modeattacking && !demo.playback) || metalrecording || marathonmode) return false; if (ev->data1 >= NUMKEYS) // See also: HUD_Responder diff --git a/src/k_hud.c b/src/k_hud.c index 55c4e4ae2..a31b2238a 100644 --- a/src/k_hud.c +++ b/src/k_hud.c @@ -5097,7 +5097,7 @@ static INT32 K_GetRaceSplitsToggle(void) return max((INT32)(cv_racesplits.value), 1); } -static boolean K_doDrawSplits() +static boolean K_doDrawSplits(void) { return (!K_DisplayingLapEmblem()) && stplyr->karthud[khud_splittimer] && @@ -5119,7 +5119,7 @@ static void K_drawLapSplitTimestamp(void) INT32 skin = stplyr->karthud[khud_splitskin]; INT32 color = stplyr->karthud[khud_splitcolor]; INT32 ahead = stplyr->karthud[khud_splitwin]; - INT32 pos = stplyr->karthud[khud_splitposition]; + // INT32 pos = stplyr->karthud[khud_splitposition]; INT32 splitflags = V_HUDTRANS|V_SNAPTOTOP|V_SNAPTORIGHT|V_SPLITSCREEN; @@ -6124,7 +6124,7 @@ void K_DrawDriftGauge(void) boolean rainbow = driftcharge >= driftval*4; const UINT8 level = K_GetKartDriftSparkStageForValue(stplyr, driftcharge) + 1; const UINT8 backlevel = rainbow ? 4 : max(0, level - 1); - UINT8 *cmap = R_GetTranslationColormap(TC_RAINBOW, rainbow ? 1 + (leveltime % FIRSTSUPERCOLOR) : driftskins[level], GTC_CACHE); + UINT8 *cmap = R_GetTranslationColormap(TC_RAINBOW, rainbow ? (INT32)(1 + (leveltime % FIRSTSUPERCOLOR)) : driftskins[level], GTC_CACHE); INT32 afterimage = stplyr->karthud[khud_afterimagetime]; if (!stplyr->drift) diff --git a/src/k_kart.c b/src/k_kart.c index fa5b992e1..8b9d98270 100644 --- a/src/k_kart.c +++ b/src/k_kart.c @@ -6385,11 +6385,15 @@ static void K_RaceStart(player_t *player) // RA ez charge for less annoying starts. if (modeattacking != ATTACKING_NONE && !G_CompatLevel(0x0009)) { + SINT8 clampsize = 0; // Let players choose between startboost and sneaker boost by holding item. if (player->cmd.buttons & BT_ATTACK) - player->boostcharge = min(player->boostcharge++, 37); + clampsize = 37; else - player->boostcharge = min(player->boostcharge++, 36); + clampsize = 36; + + player->boostcharge++; + player->boostcharge = min(player->boostcharge, clampsize); } else player->boostcharge++;