stjr
/
Kart-Public
mirror of https://git.do.srb2.org/KartKrew/Kart-Public.git
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'splitscreen-hudhook-fix' into 'next' 

Clear and draw all game hud hook calls to 1 list

See merge request KartKrew/Kart-Public!318
This commit is contained in:
Eidolon 2022-10-26 03:04:51 +00:00
parent a99b2c9974 2cffc9b488
commit 7e17eb8591
1 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/st_stuff.c
View File

@ -1967,12 +1967,10 @@ static void ST_overlayDrawer(void)
{ {
if (renderisnewtic) if (renderisnewtic)
{ {
LUA_HUD_ClearDrawList(luahuddrawlist_game);
LUAh_GameHUD(stplyr, luahuddrawlist_game); LUAh_GameHUD(stplyr, luahuddrawlist_game);
} }
LUA_HUD_DrawList(luahuddrawlist_game);
} }
#endif #endif // HAVE_BLUA
// draw level title Tails // draw level title Tails
if (*mapheaderinfo[gamemap-1]->lvlttl != '\0' && !(hu_showscores && (netgame || multiplayer) && !mapreset) if (*mapheaderinfo[gamemap-1]->lvlttl != '\0' && !(hu_showscores && (netgame || multiplayer) && !mapreset)
@ -2166,6 +2164,12 @@ void ST_Drawer(void)
if (st_overlay) if (st_overlay)
{ {
#ifdef HAVE_BLUA
if (renderisnewtic)
{
LUA_HUD_ClearDrawList(luahuddrawlist_game);
}
#endif // HAVE_BLUA
// No deadview! // No deadview!
for (i = 0; i <= splitscreen; i++) for (i = 0; i <= splitscreen; i++)
{ {
@ -2173,6 +2177,10 @@ void ST_Drawer(void)
ST_overlayDrawer(); ST_overlayDrawer();
} }
#ifdef HAVE_BLUA
LUA_HUD_DrawList(luahuddrawlist_game);
#endif // HAVE_BLUA
// draw Midnight Channel's overlay ontop // draw Midnight Channel's overlay ontop
if (mapheaderinfo[gamemap-1]->typeoflevel & TOL_TV) // Very specific Midnight Channel stuff. if (mapheaderinfo[gamemap-1]->typeoflevel & TOL_TV) // Very specific Midnight Channel stuff.
ST_MayonakaStatic(); ST_MayonakaStatic();