From 58b52adf7eec10c52e8492122750d43a143c0bb0 Mon Sep 17 00:00:00 2001 From: TehRealSalt Date: Mon, 1 Oct 2018 19:23:38 -0400 Subject: [PATCH] Address toast review - Re-add highlighting to the header text, and shift it back up slightly - Move the viewpoint loop break out of a while and into the main loop --- src/g_game.c | 27 +++++++++++++++------------ src/m_menu.c | 10 +++++----- 2 files changed, 20 insertions(+), 17 deletions(-) diff --git a/src/g_game.c b/src/g_game.c index bd55ea9f..d77d04f8 100644 --- a/src/g_game.c +++ b/src/g_game.c @@ -1826,12 +1826,26 @@ boolean G_Responder(event_t *ev) if (displayplayer == MAXPLAYERS) displayplayer = 0; + if (displayplayer == consoleplayer) + break; // End loop + if (!playeringame[displayplayer]) continue; if (players[displayplayer].spectator) continue; + // SRB2Kart: Only go through players who are actually playing + if (players[displayplayer].exiting) + continue; + + // I don't know if we want this actually, but I'll humor the suggestion anyway + if (G_BattleGametype()) + { + if (players[displayplayer].kartstuff[k_bumper] <= 0) + continue; + } + // SRB2Kart: we have no team-based modes, YET... /*if (G_GametypeHasTeams()) { @@ -1857,19 +1871,8 @@ boolean G_Responder(event_t *ev) continue; }*/ - // SRB2Kart: Only go through players who are actually playing - if (players[displayplayer].exiting) - continue; - - // I don't know if we want this actually, but I'll humor the suggestion anyway - if (G_BattleGametype()) - { - if (players[displayplayer].kartstuff[k_bumper] <= 0) - continue; - } - break; - } while (displayplayer != consoleplayer); + } // change statusbar also if playing back demo if (singledemo) diff --git a/src/m_menu.c b/src/m_menu.c index 9957f1eb..1e952d1a 100644 --- a/src/m_menu.c +++ b/src/m_menu.c @@ -8588,11 +8588,11 @@ static void M_DrawControl(void) // draw title (or big pic) M_DrawMenuTitle(); - M_CentreText(30, - (setupcontrols_fourthplayer ? "Set controls for Player 4" : - (setupcontrols_thirdplayer ? "Set controls for Player 3" : - (setupcontrols_secondaryplayer ? "Set controls for Player 2" : - "Press ENTER to change, BACKSPACE to clear")))); + M_CentreText(28, + (setupcontrols_fourthplayer ? "\x86""Set controls for ""\x82""Player 4" : + (setupcontrols_thirdplayer ? "\x86""Set controls for ""\x82""Player 3" : + (setupcontrols_secondaryplayer ? "\x86""Set controls for ""\x82""Player 2" : + "\x86""Press ""\x82""ENTER""\x86"" to change, ""\x82""BACKSPACE""\x86"" to clear")))); if (i) V_DrawString(currentMenu->x - 16, y-(skullAnimCounter/5), highlightflags, "\x1A"); // up arrow