diff --git a/src/k_kart.c b/src/k_kart.c index 31d096430..7e67efaca 100644 --- a/src/k_kart.c +++ b/src/k_kart.c @@ -15013,7 +15013,7 @@ fixed_t K_GetExpAdjustment(player_t *player) return result; } -UINT32 K_GetNumGradingPoints() +UINT32 K_GetNumGradingPoints(void) { return numlaps * (1 + Obj_GetCheckpointCount()); } diff --git a/src/k_kart.h b/src/k_kart.h index 769d0da97..d9ff1cbf1 100644 --- a/src/k_kart.h +++ b/src/k_kart.h @@ -296,7 +296,7 @@ boolean K_PlayerCanUseItem(player_t *player); fixed_t K_GetExpAdjustment(player_t *player); -UINT32 K_GetNumGradingPoints(); +UINT32 K_GetNumGradingPoints(void); #ifdef __cplusplus } // extern "C" diff --git a/src/k_roulette.c b/src/k_roulette.c index 3076146f4..671bca774 100644 --- a/src/k_roulette.c +++ b/src/k_roulette.c @@ -470,8 +470,10 @@ static UINT32 K_UndoMapScaling(UINT32 distance) Return:- New distance after scaling. --------------------------------------------------*/ -static UINT32 K_ScaleItemDistance(const player_t* player, UINT32 distance, UINT8 numPlayers) +static UINT32 K_ScaleItemDistance(const player_t *player, UINT32 distance, UINT8 numPlayers) { + (void)player; + if (franticitems == true) { // Frantic items pretends everyone's farther apart, for crazier items. @@ -674,14 +676,14 @@ static fixed_t K_PercentSPBOdds(const itemroulette_t *roulette, UINT8 position) INT32 K_KartGetBattleOdds(const player_t *player, UINT8 pos, kartitems_t item) { - fixed_t newOdds = 0; + (void)player; I_Assert(item > KITEM_NONE); // too many off by one scenarioes. I_Assert(item < NUMKARTRESULTS); I_Assert(pos < 2); // DO NOT allow positions past the bounds of the table - newOdds = K_KartLegacyBattleOdds[item-1][pos]; + fixed_t newOdds = K_KartLegacyBattleOdds[item-1][pos]; newOdds <<= FRACBITS; return newOdds; @@ -1065,24 +1067,6 @@ static boolean K_IsItemFirstPermitted(kartitems_t item) } } -// Maybe for later... -#if 0 -static boolean K_IsItemSpeed(kartitems_t item) -{ - switch (item) - { - case KITEM_SNEAKER: - case KRITEM_DUALSNEAKER: - case KRITEM_TRIPLESNEAKER: - case KITEM_FLAMESHIELD: - case KITEM_ROCKETSNEAKER: - return true; - default: - return false; - } -} -#endif - static boolean K_IsItemUselessAlone(kartitems_t item) { switch (item) @@ -1101,7 +1085,7 @@ static boolean K_IsItemUselessAlone(kartitems_t item) } } -static boolean K_IsItemSpeed(kartitems_t item) +ATTRUNUSED static boolean K_IsItemSpeed(kartitems_t item) { switch (item) { diff --git a/src/objects/checkpoint.cpp b/src/objects/checkpoint.cpp index 7d6208d92..10e5f3c6a 100644 --- a/src/objects/checkpoint.cpp +++ b/src/objects/checkpoint.cpp @@ -201,14 +201,13 @@ struct Checkpoint : mobj_t boolean top_half_has_passed() { - INT32 pcount = 0; INT32 winningpos = 1; INT32 nump = D_NumPlayersInRace(); winningpos = nump / 2; winningpos += nump % 2; - return players_passed() >= winningpos; + return players_passed() >= winningpos; } void animate()