From 8775e5abc1264fbd2862bdd3081970f0b73abdfc Mon Sep 17 00:00:00 2001 From: Alug Date: Mon, 10 Mar 2025 17:52:08 +0100 Subject: [PATCH] fix compile without ROTSPRITE --- src/hardware/hw_main.c | 4 ++-- src/lua_hudlib.c | 6 ++++++ src/r_things.c | 4 ++-- src/st_stuff.c | 3 +-- 4 files changed, 11 insertions(+), 6 deletions(-) diff --git a/src/hardware/hw_main.c b/src/hardware/hw_main.c index 44415d486..88d3322b3 100644 --- a/src/hardware/hw_main.c +++ b/src/hardware/hw_main.c @@ -4620,9 +4620,9 @@ static void HWR_ProjectSprite(mobj_t *thing) I_Error("sprframes NULL for sprite %d\n", thing->sprite); #endif - if (sprframe->rotate != SRF_SINGLE || papersprite || + if (sprframe->rotate != SRF_SINGLE || papersprite #ifdef ROTSPRITE - (shouldrotate) + || (shouldrotate) #endif ) { diff --git a/src/lua_hudlib.c b/src/lua_hudlib.c index ccafd59aa..45570b2cd 100644 --- a/src/lua_hudlib.c +++ b/src/lua_hudlib.c @@ -474,12 +474,16 @@ static int libd_getSpritePatch(lua_State *L) if (skn < 0) // standard sprite { sprdef = &sprites[i]; +#ifdef ROTSPRITE sprinfo = &spriteinfo[i]; +#endif } else // player skin { sprdef = &skins[skn].spritedef; +#ifdef ROTSPRITE sprinfo = &skins[skn].sprinfo; +#endif } // set frame number @@ -500,6 +504,7 @@ static int libd_getSpritePatch(lua_State *L) if (angle >= 8) // out of range? angle = (angle & 7); // modulus angle by 8 +#ifdef ROTSPRITE // rotsprite????? if (lua_isnumber(L, 4)) { @@ -515,6 +520,7 @@ static int libd_getSpritePatch(lua_State *L) return 3; } } +#endif // push both the patch and its "flip" value LUA_PushUserdata(L, W_CachePatchNum(sprframe->lumppat[angle], PU_STATIC), META_PATCH); diff --git a/src/r_things.c b/src/r_things.c index cfb79ac06..4235c81df 100644 --- a/src/r_things.c +++ b/src/r_things.c @@ -1281,9 +1281,9 @@ static void R_ProjectSprite(mobj_t *thing) I_Error("R_ProjectSprite: sprframes NULL for sprite %d\n", thing->sprite); #endif - if (sprframe->rotate != SRF_SINGLE || papersprite || + if (sprframe->rotate != SRF_SINGLE || papersprite #ifdef ROTSPRITE - (shouldrotate) + || (shouldrotate) #endif ) { diff --git a/src/st_stuff.c b/src/st_stuff.c index 13bb9a007..6e39661e7 100644 --- a/src/st_stuff.c +++ b/src/st_stuff.c @@ -277,9 +277,8 @@ void ST_ReloadSkinFaceGraphics(void) for (i = 0; i < numskins; i++) ST_LoadFaceGraphics(skins[i].facerank, skins[i].facewant, skins[i].facemmap, i); - for (i = 0; i < numlocalskins; i++) { + for (i = 0; i < numlocalskins; i++) ST_LoadLocalFaceGraphics(localskins[i].facerank, localskins[i].facewant, localskins[i].facemmap, i); - } } static inline void ST_InitData(void)