From 0a2be735bd5bc38c6da4ca818bd6c16d8dc8f4ef Mon Sep 17 00:00:00 2001 From: TehRealSalt Date: Wed, 26 Sep 2018 21:35:57 -0400 Subject: [PATCH] Viewpoint key improvements - Don't cycle through exiting players - Don't cycle through karma players in Battle - Disable console print on switch, it's already got a HUD element --- src/g_game.c | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/src/g_game.c b/src/g_game.c index e501fa569..7edd7725e 100644 --- a/src/g_game.c +++ b/src/g_game.c @@ -1831,6 +1831,7 @@ boolean G_Responder(event_t *ev) if (players[displayplayer].spectator) continue; + // SRB2Kart: we have no team-based modes, YET... /*if (G_GametypeHasTeams()) { if (players[consoleplayer].ctfteam @@ -1855,12 +1856,16 @@ boolean G_Responder(event_t *ev) continue; }*/ - // SRB2Kart: Ehhh, who cares, Mario Kart's designed around screen-cheating anyway - /*if (gametype != GT_RACE) + // 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[consoleplayer].kartstuff[k_bumper] > 0) + if (players[displayplayer].kartstuff[k_bumper] <= 0) continue; - }*/ + } break; } while (displayplayer != consoleplayer); @@ -1869,10 +1874,6 @@ boolean G_Responder(event_t *ev) if (singledemo) ST_changeDemoView(); - // tell who's the view - CONS_Printf(M_GetText("Viewpoint: %s\n"), player_names[displayplayer]); - P_ResetCamera(&players[displayplayer], &camera); - return true; } }