thirdpartymirrors/RingRacers
1
0
Fork 0
mirror of https://github.com/KartKrewDev/RingRacers.git synced 2025-10-30 08:01:28 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

toaster suggestions

Browse source
This commit is contained in:
Sally Cochenour 2020-03-22 20:29:58 -04:00
parent 7f07fa9b2d
commit 53df47b4fe
2 changed files with 13 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/k_battle.c
View file

@ -563,11 +563,7 @@ void K_SpawnBattleCapsules(void)
if (!G_BattleGametype()) if (!G_BattleGametype())
return; return;
if (modeattacking == ATTACKING_CAPSULES) if (modeattacking != ATTACKING_CAPSULES)
{
;
}
else
{ {
UINT8 n = 0; UINT8 n = 0;

15
src/y_inter.c
View file

@ -169,7 +169,7 @@ static void Y_UnloadVoteData(void);
// //
// SRB2Kart - Y_CalculateMatchData and ancillary functions // SRB2Kart - Y_CalculateMatchData and ancillary functions
// //
static void Y_CompareRace(INT32 i) static void Y_CompareTime(INT32 i)
{ {
UINT32 val = ((players[i].pflags & PF_TIMEOVER || players[i].realtime == UINT32_MAX) UINT32 val = ((players[i].pflags & PF_TIMEOVER || players[i].realtime == UINT32_MAX)
? (UINT32_MAX-1) : players[i].realtime); ? (UINT32_MAX-1) : players[i].realtime);
@ -181,7 +181,7 @@ static void Y_CompareRace(INT32 i)
data.match.num[data.match.numplayers] = i; data.match.num[data.match.numplayers] = i;
} }
static void Y_CompareBattle(INT32 i) static void Y_CompareScore(INT32 i)
{ {
UINT32 val = ((players[i].pflags & PF_TIMEOVER) UINT32 val = ((players[i].pflags & PF_TIMEOVER)
? (UINT32_MAX-1) : players[i].marescore); ? (UINT32_MAX-1) : players[i].marescore);
@ -1103,9 +1103,18 @@ void Y_StartIntermission(void)
case int_match: case int_match:
{ {
// Calculate who won // Calculate who won
Y_CalculateMatchData(0, battlecapsules ? Y_CompareRace : Y_CompareBattle); if (battlecapsules)
{
Y_CalculateMatchData(0, Y_CompareTime);
}
else
{
Y_CalculateMatchData(0, Y_CompareScore);
}
if (cv_inttime.value > 0) if (cv_inttime.value > 0)
S_ChangeMusicInternal("racent", true); // loop it S_ChangeMusicInternal("racent", true); // loop it
break; break;
} }
case int_race: // (time-only race) case int_race: // (time-only race)