zdoom/raze
0
0
Fork 0
mirror of https://github.com/ZDoom/Raze.git synced 2025-03-25 18:21:47 +00:00
Code Issues Projects Releases Packages Wiki Activity

- moved sprite animation code out of 'execute'.

Browse source
This commit is contained in:
Christoph Oelckers 2022-12-17 12:41:56 +01:00
parent 0c17a369db
commit c76c511da2
2 changed files with 45 additions and 46 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

59
source/games/duke/src/actors.cpp
View file

@ -61,14 +61,50 @@ double adjustfall(DDukeActor* actor, double c);
void TickActor(DDukeActor* self)
{
if (self->spr.statnum == STAT_ACTOR || (self->flags3 & SFLAG3_FORCERUNCON))
if (self->spr.statnum == STAT_ACTOR || self->spr.statnum == STAT_PLAYER || (self->flags3 & SFLAG3_FORCERUNCON))
{
double xx;
int p = findplayer(self, &xx);
if (!execute(self, p, xx))
double pdist;
int p;
if (self->spr.statnum != STAT_PLAYER)
{
p = findplayer(self, &pdist);
}
else
{
if (ud.multimode > 1)
p = findotherplayer(self->PlayerIndex(), &pdist);
else
{
p = self->PlayerIndex();
pdist = 0;
}
}
// Run sprite animations.
if (self->temp_data[4])
{
// This code was utterly cryptic in the original source.
auto ptr = &ScriptCode[self->temp_data[4]];
int numframes = ptr[1];
int increment = ptr[3];
int delay = ptr[4];
self->spr.lotag += TICSPERFRAME;
if (self->spr.lotag > delay)
{
self->temp_data[2]++;
self->spr.lotag = 0;
self->temp_data[3] += increment;
}
if (abs(self->temp_data[3]) >= abs(numframes * increment))
self->temp_data[3] = 0;
}
if (!execute(self, p, pdist))
{
self->state_player = &ps[p];
self->state_dist = xx;
self->state_dist = pdist;
IFVIRTUALPTR(self, DDukeActor, RunState)
{
VMValue val[] = { self };
@ -453,18 +489,10 @@ void moveplayers(void)
}
else
{
TickActor(act);
if (ud.multimode > 1)
{
otherp = findotherplayer(pn, &other);
else
{
otherp = pn;
other = 0;
}
execute(act, pn, other);
if (ud.multimode > 1)
{
auto psp = ps[otherp].GetActor();
if (psp->spr.extra > 0)
{
@ -672,6 +700,7 @@ void tickstat(int stat, bool deleteinvalid)
{
if ((act->flags2 & SFLAG2_DIENOW) || act->sector() == nullptr || (deleteinvalid && act->spr.scale.X == 0))
{
addkill(act);
act->Destroy();
}
else if (stat != STAT_ACTOR || !badguy(act) || !monsterCheatCheck(act))

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

@ -3245,45 +3245,15 @@ bool execute(DDukeActor *actor,int p,double xx)
{
if (gs.actorinfo[actor->spr.picnum].scriptaddress == 0) return false;
int done;
ParseState s;
s.g_p = p; // Player ID
s.g_x = int(xx / maptoworld); // ??
s.g_ac = actor;
s.g_t = &actor->temp_data[0]; // Sprite's 'extra' data
s.insptr = &ScriptCode[4 + (gs.actorinfo[actor->spr.picnum].scriptaddress)];
s.killit_flag = 0;
// this must go away.
if(!actor->insector())
{
addkill(actor);
actor->Destroy();
return true;
}
if (s.g_t[4])
{
// This code was utterly cryptic in the original source.
auto ptr = &ScriptCode[s.g_t[4]];
int numframes = ptr[1];
int increment = ptr[3];
int delay = ptr[4];
actor->spr.lotag += TICSPERFRAME;
if (actor->spr.lotag > delay)
{
s.g_t[2]++;
actor->spr.lotag = 0;
s.g_t[3] += increment;
}
if (abs(s.g_t[3]) >= abs(numframes * increment))
s.g_t[3] = 0;
}
int done;
do
done = s.parse();
while( done == 0 );