From 9362d5abd4e077afa1d8a4ebed055a4044604d1c Mon Sep 17 00:00:00 2001 From: GenericHeroGuy <86008856+GenericHeroGuy@users.noreply.github.com> Date: Mon, 19 Feb 2024 00:38:11 +0100 Subject: [PATCH] Add stplyrnum, move to st_stuff --- src/p_enemy.c | 1 - src/p_local.h | 3 --- src/st_stuff.c | 5 +++++ src/st_stuff.h | 2 ++ 4 files changed, 7 insertions(+), 4 deletions(-) diff --git a/src/p_enemy.c b/src/p_enemy.c index e617cfbce..cde88e607 100644 --- a/src/p_enemy.c +++ b/src/p_enemy.c @@ -33,7 +33,6 @@ boolean LUA_CallAction(const char *action, mobj_t *actor); #endif -player_t *stplyr; INT32 var1; INT32 var2; diff --git a/src/p_local.h b/src/p_local.h index df8df412e..e93d4b411 100644 --- a/src/p_local.h +++ b/src/p_local.h @@ -306,9 +306,6 @@ void P_FlashPal(player_t *pl, UINT16 type, UINT16 duration); // P_ENEMY // -// main player in game -extern player_t *stplyr; // for splitscreen correct palette changes and overlay - // Is there a better place for these? extern INT32 var1; extern INT32 var2; diff --git a/src/st_stuff.c b/src/st_stuff.c index b4b4a3d49..e7352186b 100644 --- a/src/st_stuff.c +++ b/src/st_stuff.c @@ -150,6 +150,10 @@ static patch_t *hud_tv2; static patch_t *envelope; #endif +// current player for overlay drawing +player_t *stplyr; +UINT8 stplyrnum; + // SRB2kart hudinfo_t hudinfo[NUMHUDITEMS] = @@ -2223,6 +2227,7 @@ void ST_Drawer(void) for (i = 0; i <= splitscreen; i++) { stplyr = &players[displayplayers[i]]; + stplyrnum = i; ST_overlayDrawer(); } diff --git a/src/st_stuff.h b/src/st_stuff.h index 0dffa46c3..d46688e8f 100644 --- a/src/st_stuff.h +++ b/src/st_stuff.h @@ -68,6 +68,8 @@ boolean ST_SameTeam(player_t *a, player_t *b); extern boolean st_overlay; // sb overlay on or off when fullscreen extern INT32 st_palette; // 0 is default, any others are special palettes. +extern player_t *stplyr; // for splitscreen correct palette changes and overlay +extern UINT8 stplyrnum; extern lumpnum_t st_borderpatchnum; // patches, also used in intermission