stjr/Kart-Public
0
0
Fork 0
mirror of https://git.do.srb2.org/KartKrew/Kart-Public.git synced 2024-12-26 12:21:19 +00:00
Code Issues Projects Releases Packages Wiki Activity

Show WANTED and minimap in battle splits even when p1 is nuked.

Browse source
This commit is contained in:
toaster 2019-02-03 23:37:19 +00:00
parent 88de3546a5
commit 503e4f977f
1 changed files with 7 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
src/k_kart.c
View file

@ -8348,14 +8348,6 @@ void K_drawKartHUD(void)
|| ((splitscreen > 2 && stplyr == &players[fourthdisplayplayer]) && !camera4.chase)) || ((splitscreen > 2 && stplyr == &players[fourthdisplayplayer]) && !camera4.chase))
K_drawKartFirstPerson(); K_drawKartFirstPerson();
/* if (splitscreen == 2) // Player 4 in 3P is the minimap :p
{
#ifdef HAVE_BLUA
if (LUA_HudEnabled(hud_minimap))
#endif
K_drawKartMinimap();
}*/
// Draw full screen stuff that turns off the rest of the HUD // Draw full screen stuff that turns off the rest of the HUD
if (mapreset && stplyr == &players[displayplayer]) if (mapreset && stplyr == &players[displayplayer])
{ {
@ -8371,7 +8363,9 @@ void K_drawKartHUD(void)
&& stplyr->playerstate == PST_LIVE))) && stplyr->playerstate == PST_LIVE)))
{ {
K_drawBattleFullscreen(); K_drawBattleFullscreen();
return; if (!splitscreen)
return;
isfreeplay = true; // variable reuse, since isfreeplay will not be otherwise set until after everything we want to happen
} }
// Draw the CHECK indicator before the other items, so it's overlapped by everything else // Draw the CHECK indicator before the other items, so it's overlapped by everything else
@ -8392,10 +8386,12 @@ void K_drawKartHUD(void)
#ifdef HAVE_BLUA #ifdef HAVE_BLUA
if (LUA_HudEnabled(hud_minimap)) if (LUA_HudEnabled(hud_minimap))
#endif #endif
K_drawKartMinimap(); // 3P splitscreen is handled above K_drawKartMinimap();
} }
if (isfreeplay)
return;
// Draw the item window // Draw the item window
#ifdef HAVE_BLUA #ifdef HAVE_BLUA
if (LUA_HudEnabled(hud_item)) if (LUA_HudEnabled(hud_item))