thirdpartymirrors/RingRacers
1
0
Fork 0
mirror of https://github.com/KartKrewDev/RingRacers.git synced 2026-04-26 12:01:47 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix compile warnings

Browse source
This commit is contained in:
Sally Coolatta 2024-08-28 17:56:11 -04:00
parent 7c46cc029d
commit 158d8ac5d3
4 changed files with 9 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/k_kart.c
View file

@ -15013,7 +15013,7 @@ fixed_t K_GetExpAdjustment(player_t *player)
return result; return result;
} }
UINT32 K_GetNumGradingPoints() UINT32 K_GetNumGradingPoints(void)
{ {
return numlaps * (1 + Obj_GetCheckpointCount()); return numlaps * (1 + Obj_GetCheckpointCount());
} }

2
src/k_kart.h
View file

@ -296,7 +296,7 @@ boolean K_PlayerCanUseItem(player_t *player);
fixed_t K_GetExpAdjustment(player_t *player); fixed_t K_GetExpAdjustment(player_t *player);
UINT32 K_GetNumGradingPoints(); UINT32 K_GetNumGradingPoints(void);
#ifdef __cplusplus #ifdef __cplusplus
} // extern "C" } // extern "C"

28
src/k_roulette.c
View file

@ -470,8 +470,10 @@ static UINT32 K_UndoMapScaling(UINT32 distance)
Return:- Return:-
New distance after scaling. 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) if (franticitems == true)
{ {
// Frantic items pretends everyone's farther apart, for crazier items. // 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) 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 > KITEM_NONE); // too many off by one scenarioes.
I_Assert(item < NUMKARTRESULTS); I_Assert(item < NUMKARTRESULTS);
I_Assert(pos < 2); // DO NOT allow positions past the bounds of the table 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; newOdds <<= FRACBITS;
return newOdds; 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) static boolean K_IsItemUselessAlone(kartitems_t item)
{ {
switch (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) switch (item)
{ {

3
src/objects/checkpoint.cpp
View file

@ -201,14 +201,13 @@ struct Checkpoint : mobj_t
boolean top_half_has_passed() boolean top_half_has_passed()
{ {
INT32 pcount = 0;
INT32 winningpos = 1; INT32 winningpos = 1;
INT32 nump = D_NumPlayersInRace(); INT32 nump = D_NumPlayersInRace();
winningpos = nump / 2; winningpos = nump / 2;
winningpos += nump % 2; winningpos += nump % 2;
return players_passed() >= winningpos; return players_passed() >= winningpos;
} }
void animate() void animate()