diff --git a/src/d_netcmd.c b/src/d_netcmd.c index b51f1408a..13f709b2b 100644 --- a/src/d_netcmd.c +++ b/src/d_netcmd.c @@ -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; } diff --git a/src/p_setup.c b/src/p_setup.c index 0012dda6d..c9cf7ec5c 100644 --- a/src/p_setup.c +++ b/src/p_setup.c @@ -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) { diff --git a/src/p_tick.c b/src/p_tick.c index 98ca4b690..b6b76dcec 100644 --- a/src/p_tick.c +++ b/src/p_tick.c @@ -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;