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

Merge branch 'split_is_just_a_synonym_for_disappear' into 'next'

Browse source 
Split is just a synonym for disappear

See merge request KartKrew/Kart-Public!50
This commit is contained in:
Sal 2019-02-03 21:46:59 -05:00
commit b0d9ea537f
1 changed files with 29 additions and 32 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

61
src/k_kart.c
View file

@ -8336,6 +8336,7 @@ static void K_drawCheckpointDebugger(void)
void K_drawKartHUD(void) void K_drawKartHUD(void)
{ {
boolean isfreeplay = false; boolean isfreeplay = false;
boolean battlefullscreen = false;
// Define the X and Y for each drawn object // Define the X and Y for each drawn object
// This is handled by console/menu values // This is handled by console/menu values
@ -8348,14 +8349,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])
{ {
@ -8363,39 +8356,43 @@ void K_drawKartHUD(void)
return; return;
} }
if ((G_BattleGametype()) battlefullscreen = ((G_BattleGametype())
&& (stplyr->exiting && (stplyr->exiting
|| (stplyr->kartstuff[k_bumper] <= 0 || (stplyr->kartstuff[k_bumper] <= 0
&& stplyr->kartstuff[k_comebacktimer] && stplyr->kartstuff[k_comebacktimer]
&& comeback && comeback
&& stplyr->playerstate == PST_LIVE))) && stplyr->playerstate == PST_LIVE)));
if (!battlefullscreen || splitscreen)
{
// Draw the CHECK indicator before the other items, so it's overlapped by everything else
if (cv_kartcheck.value && !splitscreen && !players[displayplayer].exiting)
K_drawKartPlayerCheck();
// Draw WANTED status
if (G_BattleGametype())
{
#ifdef HAVE_BLUA
if (LUA_HudEnabled(hud_wanted))
#endif
K_drawKartWanted();
}
if (cv_kartminimap.value && !titledemo)
{
#ifdef HAVE_BLUA
if (LUA_HudEnabled(hud_minimap))
#endif
K_drawKartMinimap();
}
}
if (battlefullscreen)
{ {
K_drawBattleFullscreen(); K_drawBattleFullscreen();
return; return;
} }
// Draw the CHECK indicator before the other items, so it's overlapped by everything else
if (cv_kartcheck.value && !splitscreen && !players[displayplayer].exiting)
K_drawKartPlayerCheck();
// Draw WANTED status
if (G_BattleGametype())
{
#ifdef HAVE_BLUA
if (LUA_HudEnabled(hud_wanted))
#endif
K_drawKartWanted();
}
if (cv_kartminimap.value && !titledemo)
{
#ifdef HAVE_BLUA
if (LUA_HudEnabled(hud_minimap))
#endif
K_drawKartMinimap(); // 3P splitscreen is handled above
}
// Draw the item window // Draw the item window
#ifdef HAVE_BLUA #ifdef HAVE_BLUA
if (LUA_HudEnabled(hud_item)) if (LUA_HudEnabled(hud_item))