zdoom/raze
0
0
Fork 0
mirror of https://github.com/ZDoom/Raze.git synced 2025-03-22 17:01:08 +00:00
Code Issues Projects Releases Packages Wiki Activity

- replace dispicnum with dispictex

Browse source
This commit is contained in:
Christoph Oelckers 2023-04-23 10:32:58 +02:00
parent b2493116f8
commit cc83438e31
8 changed files with 12 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
source/core/coreactor.h
View file

@ -50,7 +50,7 @@ public:
int time;
int16_t spritesetindex;
int16_t dispicnum;
FTextureID dispictex;
DCoreActor() = default;

2
source/core/savegamehelp.cpp
View file

@ -621,7 +621,7 @@ void DCoreActor::Serialize(FSerializer& arc)
("yvel", vel.Y)
("zvel", vel.Z)
("viewzoffset", viewzoffset)
("dispicnum", dispicnum);
("dispicnum", dispictex);
if (arc.isReading())
{

2
source/core/vmexports.cpp
View file

@ -801,7 +801,7 @@ void tspritetype_setSpritePic(tspritetype* targ, DCoreActor* self, unsigned z)
}
else if (z == ~0)
{
targ->picnum = self->dispicnum;
targ->setspritetexture(self->dispictex);
}
}

4
source/games/duke/src/animatesprites.cpp
View file

@ -203,8 +203,8 @@ void applyanimations(tspritetype* t, DDukeActor* h, const DVector2& viewVec, DAn
t->scale = DVector2(0, 0);
}
if (h->dispicnum >= 0)
h->dispicnum = t->picnum;
if (h->dispictex.isValid())
h->dispictex = t->spritetexture();
}
else if (display_mirror == 1)
t->cstat |= CSTAT_SPRITE_XFLIP;

6
source/games/duke/src/animatesprites_d.cpp
View file

@ -111,8 +111,8 @@ void animatesprites_d(tspriteArray& tsprites, const DVector2& viewVec, DAngle vi
if (res)
{
if (h->dispicnum >= 0)
h->dispicnum = t->picnum;
if (h->dispictex.isValid())
h->dispictex = t->spritetexture();
continue;
}
@ -227,7 +227,7 @@ void animatesprites_d(tspriteArray& tsprites, const DVector2& viewVec, DAngle vi
}
}
h->dispicnum = t->picnum;
h->dispictex = t->spritetexture();
if (t->sectp->floortexture == mirrortex)
t->scale = DVector2(0, 0);
}

6
source/games/duke/src/animatesprites_r.cpp
View file

@ -109,8 +109,8 @@ void animatesprites_r(tspriteArray& tsprites, const DVector2& viewVec, DAngle vi
if (res)
{
if (h->dispicnum >= 0)
h->dispicnum = t->picnum;
if (h->dispictex.isValid())
h->dispictex = t->spritetexture();
continue;
}
@ -238,7 +238,7 @@ void animatesprites_r(tspriteArray& tsprites, const DVector2& viewVec, DAngle vi
drawshadows(tsprites, t, h);
}
h->dispicnum = t->picnum;
h->dispictex = t->spritetexture();
if (t->sectp->floortexture == mirrortex)
t->scale = DVector2(0, 0);
}

4
source/games/duke/src/gameexec.cpp
View file

@ -1268,10 +1268,6 @@ void DoActor(bool bSet, int lVar1, int lLabelID, int lVar2, DDukeActor* sActor,
if (bSet) act->actorstayput = toSect(lValue);
else SetGameVarID(lVar2, fromSect(act->actorstayput), sActor, sPlayer);
break;
case ACTOR_HTDISPICNUM:
if (bSet) act->dispicnum = lValue;
else SetGameVarID(lVar2, act->dispicnum, sActor, sPlayer);
break;
case ACTOR_HTTIMETOSLEEP:
if (bSet) act->timetosleep = lValue;
else SetGameVarID(lVar2, act->timetosleep, sActor, sPlayer);

2
source/games/duke/src/player.cpp
View file

@ -1515,7 +1515,7 @@ void playerreset(player_struct* p, DDukeActor* g_ac)
g_ac->movflag = 0;
g_ac->tempval = 0;
g_ac->actorstayput = nullptr;
g_ac->dispicnum = 0;
g_ac->dispictex = FNullTextureID();
g_ac->SetHitOwner(p->GetActor());
g_ac->temp_data[4] = 0;