thirdpartymirrors/RingRacers
1
0
Fork 0
mirror of https://github.com/KartKrewDev/RingRacers.git synced 2026-03-10 05:06:22 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'battle-rethink' of https://git.do.srb2.org/KartKrew/Kart into battle-rethink

Browse source
This commit is contained in:
Sally Coolatta 2020-10-26 22:20:25 -04:00
commit 201f8365db
3 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/k_battle.c
View file

@ -501,7 +501,7 @@ void K_RunBattleOvertime(void)
if (battleovertime.radius > 0)
{
const fixed_t pi = (22 * FRACUNIT) / 7; // loose approximation, this doesn't need to be incredibly precise
const UINT32 orbs = 32;
const INT32 orbs = 32;
const angle_t angoff = ANGLE_MAX / orbs;
const UINT8 spriteSpacing = 128;

4
src/p_mobj.c
View file

@ -9945,7 +9945,7 @@ mobjtype_t P_GetMobjtype(UINT16 mthingtype)
void P_RespawnSpecials(void)
{
UINT8 p, pcount = 0;
tic_t time = 30*TICRATE; // Respawn things in empty dedicated servers
INT32 time = 30*TICRATE; // Respawn things in empty dedicated servers
mapthing_t *mthing = NULL;
if (!(gametyperules & GTR_CIRCUIT) && numgotboxes >= (4*nummapboxes/5)) // Battle Mode respawns all boxes in a different way
@ -9993,7 +9993,7 @@ void P_RespawnSpecials(void)
return;
// the first item in the queue is the first to respawn
if (leveltime - itemrespawntime[iquetail] < time)
if (leveltime - itemrespawntime[iquetail] < (tic_t)time)
return;
mthing = itemrespawnque[iquetail];

2
src/p_user.c
View file

@ -1786,6 +1786,8 @@ static void P_CheckInvincibilityTimer(player_t *player)
player->mo->color = player->skincolor;
G_GhostAddColor((INT32) (player - players), GHC_NORMAL);
}
P_RestoreMusic(player);
}
}