fix compile without ROTSPRITE
This commit is contained in:
1 parent
fe6b5a83f8
commit
8775e5abc1
4 files changed
+11
-6
No files matched your search
@@ -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
|
||||
)
|
||||
{
|
||||
|
||||
@@ -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);
|
||||
|
||||
+2
-2
@@ -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
|
||||
)
|
||||
{
|
||||
|
||||
+1
-2
@@ -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)
|
||||
|
||||
Reference in new issue
Block a user