mirror of
https://github.com/KartKrewDev/RingRacers.git
synced 2025-10-30 08:01:28 +00:00
Assorted minor tidyup while handling previous commits in this branch
This commit is contained in:
parent
75d8f1539c
commit
1ac64dc0ed
3 changed files with 10 additions and 8 deletions
|
|
@ -2934,7 +2934,7 @@ static void Command_QueueMap_f(void)
|
|||
return;
|
||||
}
|
||||
|
||||
if ((/*newmapnum != 1 &&*/ M_MapLocked(newmapnum)))
|
||||
if (/*newmapnum != 1 &&*/ M_MapLocked(newmapnum))
|
||||
{
|
||||
ischeating = true;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -8281,7 +8281,14 @@ boolean P_LoadLevel(boolean fromnetsave, boolean reloadinggamestate)
|
|||
}
|
||||
}
|
||||
|
||||
if (K_PodiumHasEmerald())
|
||||
// Default
|
||||
levelfadecol = 31;
|
||||
|
||||
if (gamestate == GS_TITLESCREEN)
|
||||
{
|
||||
;
|
||||
}
|
||||
else if (K_PodiumHasEmerald())
|
||||
{
|
||||
// Special Stage out
|
||||
if (ranspecialwipe != 2)
|
||||
|
|
@ -8311,11 +8318,6 @@ boolean P_LoadLevel(boolean fromnetsave, boolean reloadinggamestate)
|
|||
levelfadecol = 0;
|
||||
wipetype = wipe_encore_towhite;
|
||||
}
|
||||
else
|
||||
{
|
||||
// Default
|
||||
levelfadecol = 31;
|
||||
}
|
||||
|
||||
if (rendermode != render_none)
|
||||
{
|
||||
|
|
|
|||
|
|
@ -1045,7 +1045,7 @@ void P_Ticker(boolean run)
|
|||
}
|
||||
|
||||
player_t *player = &players[i];
|
||||
if (K_PlayerTallyActive(player) == true && player->tally.done == false)
|
||||
if (player->spectator == false && K_PlayerTallyActive(player) == true && player->tally.done == false)
|
||||
{
|
||||
run_exit_countdown = false;
|
||||
break;
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue