zdoom/raze
0
0
Fork 0
mirror of https://github.com/ZDoom/Raze.git synced 2024-11-15 08:51:24 +00:00
Code Issues Projects Releases Packages Wiki Activity

- Exhumed: Rename actionSeq members for clarity.

Browse source
This commit is contained in:
Mitchell Richters 2023-04-06 23:45:07 +10:00
parent 310f615c8c
commit 27c87b247c
16 changed files with 41 additions and 41 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
source/games/exhumed/src/anubis.cpp
View file

@ -120,7 +120,7 @@ void AIAnubis::Tick(RunListEvent* ev)
{
const auto ap = ev->pObjActor;
const int nAction = ap->nAction;
const int nSeq = getSeqFromId(kSeqAnubis, AnubisSeq[nAction].a);
const int nSeq = getSeqFromId(kSeqAnubis, AnubisSeq[nAction].nSeqId);
const int nFrame = getSeqFrame(nSeq, ap->nFrame);
const int nFlag = getSeqFrameFlags(nFrame);
bool bVal = false;
@ -340,7 +340,7 @@ void AIAnubis::Draw(RunListEvent* ev)
const auto ap = ev->pObjActor;
if (!ap) return;
seq_PlotSequence(ev->nParam, getSeqFromId(kSeqAnubis, AnubisSeq[ap->nAction].a), ap->nFrame, AnubisSeq[ap->nAction].b);
seq_PlotSequence(ev->nParam, getSeqFromId(kSeqAnubis, AnubisSeq[ap->nAction].nSeqId), ap->nFrame, AnubisSeq[ap->nAction].nFlags);
}
void AIAnubis::RadialDamage(RunListEvent* ev)

6
source/games/exhumed/src/fish.cpp
View file

@ -179,7 +179,7 @@ void BuildFish(DExhumedActor* pActor, const DVector3& pos, sectortype* pSector,
pActor->spr.pal = pActor->sector()->ceilingpal;
pActor->spr.xoffset = 0;
pActor->spr.yoffset = 0;
pActor->spr.picnum = seq_GetSeqPicnum(kSeqFish, FishSeq[0].a, 0);
pActor->spr.picnum = seq_GetSeqPicnum(kSeqFish, FishSeq[0].nSeqId, 0);
pActor->vel.X = 0;
pActor->vel.Y = 0;
pActor->vel.Z = 0;
@ -258,7 +258,7 @@ void AIFish::Draw(RunListEvent* ev)
if (pActor == nullptr) return;
int nAction = pActor->nAction;
seq_PlotSequence(ev->nParam, getSeqFromId(kSeqFish, FishSeq[nAction].a), pActor->nFrame, FishSeq[nAction].b);
seq_PlotSequence(ev->nParam, getSeqFromId(kSeqFish, FishSeq[nAction].nSeqId), pActor->nFrame, FishSeq[nAction].nFlags);
ev->pTSprite->ownerActor = nullptr;
return;
}
@ -362,7 +362,7 @@ void AIFish::Tick(RunListEvent* ev)
Gravity(pActor);
}
int nSeq = getSeqFromId(kSeqFish, FishSeq[nAction].a);
int nSeq = getSeqFromId(kSeqFish, FishSeq[nAction].nSeqId);
pActor->spr.picnum = seq_GetSeqPicnum2(nSeq, pActor->nFrame);

8
source/games/exhumed/src/lavadude.cpp
View file

@ -119,7 +119,7 @@ void BuildLava(DExhumedActor* pActor, const DVector3& pos, sectortype* pSector,
pActor->clipdist = 31.75;
pActor->spr.xoffset = 0;
pActor->spr.yoffset = 0;
pActor->spr.picnum = seq_GetSeqPicnum(kSeqLavag, LavadudeSeq[3].a, 0);
pActor->spr.picnum = seq_GetSeqPicnum(kSeqLavag, LavadudeSeq[3].nSeqId, 0);
pActor->vel.X = 0;
pActor->vel.Y = 0;
pActor->vel.Z = 0;
@ -150,9 +150,9 @@ void AILavaDude::Draw(RunListEvent* ev)
if (!pActor) return;
int nAction = pActor->nAction;
int nSeq = getSeqFromId(kSeqLavag, LavadudeSeq[nAction].a);
int nSeq = getSeqFromId(kSeqLavag, LavadudeSeq[nAction].nSeqId);
seq_PlotSequence(ev->nParam, nSeq, pActor->nFrame, LavadudeSeq[nAction].b);
seq_PlotSequence(ev->nParam, nSeq, pActor->nFrame, LavadudeSeq[nAction].nFlags);
ev->pTSprite->ownerActor = nullptr;
return;
}
@ -213,7 +213,7 @@ void AILavaDude::Tick(RunListEvent* ev)
if (!pActor) return;
int nAction = pActor->nAction;
int nSeq = getSeqFromId(kSeqLavag, LavadudeSeq[nAction].a);
int nSeq = getSeqFromId(kSeqLavag, LavadudeSeq[nAction].nSeqId);
pActor->spr.picnum = seq_GetSeqPicnum2(nSeq, pActor->nFrame);
int var_38 = pActor->nFrame;

4
source/games/exhumed/src/lion.cpp
View file

@ -93,7 +93,7 @@ void AILion::Draw(RunListEvent* ev)
if (!pActor) return;
int nAction = pActor->nAction;
seq_PlotSequence(ev->nParam, getSeqFromId(kSeqLion, LionSeq[nAction].a), pActor->nFrame, LionSeq[nAction].b);
seq_PlotSequence(ev->nParam, getSeqFromId(kSeqLion, LionSeq[nAction].nSeqId), pActor->nFrame, LionSeq[nAction].nFlags);
}
void AILion::RadialDamage(RunListEvent* ev)
@ -198,7 +198,7 @@ void AILion::Tick(RunListEvent* ev)
Gravity(pActor);
}
int nSeq = getSeqFromId(kSeqLion, LionSeq[nAction].a);
int nSeq = getSeqFromId(kSeqLion, LionSeq[nAction].nSeqId);
pActor->spr.picnum = seq_GetSeqPicnum2(nSeq, pActor->nFrame);

4
source/games/exhumed/src/mummy.cpp
View file

@ -139,7 +139,7 @@ void AIMummy::Tick(RunListEvent* ev)
Gravity(pActor);
int nSeq = getSeqFromId(kSeqMummy, MummySeq[nAction].a);
int nSeq = getSeqFromId(kSeqMummy, MummySeq[nAction].nSeqId);
pActor->spr.picnum = seq_GetSeqPicnum2(nSeq, pActor->nFrame);
@ -419,7 +419,7 @@ void AIMummy::Draw(RunListEvent* ev)
if (!pActor) return;
int nAction = pActor->nAction;
seq_PlotSequence(ev->nParam, getSeqFromId(kSeqMummy, MummySeq[nAction].a), pActor->nFrame, MummySeq[nAction].b);
seq_PlotSequence(ev->nParam, getSeqFromId(kSeqMummy, MummySeq[nAction].nSeqId), pActor->nFrame, MummySeq[nAction].nFlags);
return;
}

6
source/games/exhumed/src/player.cpp
View file

@ -529,7 +529,7 @@ void AIPlayer::Draw(RunListEvent* ev)
const auto pPlayer = &PlayerList[nPlayer];
const auto nAction = pPlayer->nAction;
seq_PlotSequence(ev->nParam, getSeqFromId(pPlayer->nSeq, PlayerSeq[nAction].a), pPlayer->nSeqSize, PlayerSeq[nAction].b);
seq_PlotSequence(ev->nParam, getSeqFromId(pPlayer->nSeq, PlayerSeq[nAction].nSeqId), pPlayer->nSeqSize, PlayerSeq[nAction].nFlags);
}
//---------------------------------------------------------------------------
@ -1912,7 +1912,7 @@ static bool doPlayerDeathRestart(Player* const pPlayer)
static void doPlayerActionSequence(Player* const pPlayer)
{
const auto pPlayerActor = pPlayer->pActor;
const auto nSeq = getSeqFromId(pPlayer->nSeq, PlayerSeq[pPlayer->nAction].a);
const auto nSeq = getSeqFromId(pPlayer->nSeq, PlayerSeq[pPlayer->nAction].nSeqId);
seq_MoveSequence(pPlayerActor, nSeq, pPlayer->nSeqSize);
pPlayer->nSeqSize++;
@ -2007,7 +2007,7 @@ void AIPlayer::Tick(RunListEvent* ev)
const auto pPlayer = &PlayerList[nPlayer];
const auto pPlayerActor = pPlayer->pActor;
pPlayerActor->spr.picnum = seq_GetSeqPicnum(pPlayer->nSeq, PlayerSeq[nHeightTemplate[pPlayer->nAction]].a, pPlayer->nSeqSize);
pPlayerActor->spr.picnum = seq_GetSeqPicnum(pPlayer->nSeq, PlayerSeq[nHeightTemplate[pPlayer->nAction]].nSeqId, pPlayer->nSeqSize);
pPlayer->pDoppleSprite->spr.picnum = pPlayerActor->spr.picnum;
doPlayerCounters(pPlayer);

14
source/games/exhumed/src/queen.cpp
View file

@ -542,7 +542,7 @@ void AIQueenEgg::Tick(RunListEvent* ev)
Gravity(pActor);
}
int nSeq = getSeqFromId(kSeqQueenEgg, EggSeq[nAction].a);
int nSeq = getSeqFromId(kSeqQueenEgg, EggSeq[nAction].nSeqId);
pActor->spr.picnum = seq_GetSeqPicnum2(nSeq, pEgg->nFrame);
@ -725,7 +725,7 @@ void AIQueenEgg::Draw(RunListEvent* ev)
{
int nEgg = RunData[ev->nRun].nObjIndex;
Egg* pEgg = &QueenEgg[nEgg];
seq_PlotSequence(ev->nParam, getSeqFromId(kSeqQueenEgg, EggSeq[pEgg->nAction].a), pEgg->nFrame, EggSeq[pEgg->nAction].b);
seq_PlotSequence(ev->nParam, getSeqFromId(kSeqQueenEgg, EggSeq[pEgg->nAction].nSeqId), pEgg->nFrame, EggSeq[pEgg->nAction].nFlags);
}
//---------------------------------------------------------------------------
@ -798,7 +798,7 @@ void AIQueenHead::Tick(RunListEvent* ev)
Gravity(pActor);
}
int nSeq = getSeqFromId(kSeqQueen, HeadSeq[QueenHead.nAction].a);
int nSeq = getSeqFromId(kSeqQueen, HeadSeq[QueenHead.nAction].nSeqId);
seq_MoveSequence(pActor, nSeq, QueenHead.nFrame);
@ -1135,8 +1135,8 @@ void AIQueenHead::Draw(RunListEvent* ev)
if (nHead == 0)
{
edx = HeadSeq[nAction].b;
nSeq += HeadSeq[nAction].a;
edx = HeadSeq[nAction].nFlags;
nSeq += HeadSeq[nAction].nSeqId;
}
else
{
@ -1239,7 +1239,7 @@ void AIQueen::Tick(RunListEvent* ev)
Gravity(pActor);
}
int nSeq = getSeqFromId(kSeqQueen, QueenSeq[nAction].a);
int nSeq = getSeqFromId(kSeqQueen, QueenSeq[nAction].nSeqId);
pActor->spr.picnum = seq_GetSeqPicnum2(nSeq, QueenList[nQueen].nFrame);
@ -1572,7 +1572,7 @@ void AIQueen::Draw(RunListEvent* ev)
int nQueen = RunData[ev->nRun].nObjIndex;
assert(nQueen >= 0 && nQueen < kMaxQueens);
int nAction = QueenList[nQueen].nAction;
seq_PlotSequence(ev->nParam, getSeqFromId(kSeqQueen, QueenSeq[nAction].a), QueenList[nQueen].nFrame, QueenSeq[nAction].b);
seq_PlotSequence(ev->nParam, getSeqFromId(kSeqQueen, QueenSeq[nAction].nSeqId), QueenList[nQueen].nFrame, QueenSeq[nAction].nFlags);
}
END_PS_NS

4
source/games/exhumed/src/ra.cpp
View file

@ -209,7 +209,7 @@ void AIRa::Tick(RunListEvent* ev)
int nPlayer = RunData[ev->nRun].nObjIndex;
int nCurrentWeapon = PlayerList[nPlayer].nCurrentWeapon;
int nSeq = getSeqFromId(kSeqEyeHit, RaSeq[Ra[nPlayer].nAction].a);
int nSeq = getSeqFromId(kSeqEyeHit, RaSeq[Ra[nPlayer].nAction].nSeqId);
DExhumedActor* pActor = Ra[nPlayer].pActor;
if (!pActor) return;
@ -336,7 +336,7 @@ void AIRa::Tick(RunListEvent* ev)
void AIRa::Draw(RunListEvent* ev)
{
int nPlayer = RunData[ev->nRun].nObjIndex;
int nSeq = getSeqFromId(kSeqEyeHit, RaSeq[Ra[nPlayer].nAction].a);
int nSeq = getSeqFromId(kSeqEyeHit, RaSeq[Ra[nPlayer].nAction].nSeqId);
seq_PlotSequence(ev->nParam, nSeq, Ra[nPlayer].nFrame, 1);
ev->pTSprite->ownerActor = nullptr;

4
source/games/exhumed/src/rat.cpp
View file

@ -224,7 +224,7 @@ void AIRat::Draw(RunListEvent* ev)
if (!pActor) return;
int nAction = pActor->nAction;
seq_PlotSequence(ev->nParam, getSeqFromId(kSeqRat, RatSeq[nAction].a), pActor->nFrame, RatSeq[nAction].b);
seq_PlotSequence(ev->nParam, getSeqFromId(kSeqRat, RatSeq[nAction].nSeqId), pActor->nFrame, RatSeq[nAction].nFlags);
}
@ -244,7 +244,7 @@ void AIRat::Tick(RunListEvent* ev)
bool bVal = false;
int nSeq = getSeqFromId(kSeqRat, RatSeq[nAction].a);
int nSeq = getSeqFromId(kSeqRat, RatSeq[nAction].nSeqId);
pActor->spr.picnum = seq_GetSeqPicnum2(nSeq, pActor->nFrame);
seq_MoveSequence(pActor, nSeq, pActor->nFrame);

4
source/games/exhumed/src/rex.cpp
View file

@ -171,7 +171,7 @@ void AIRex::Draw(RunListEvent* ev)
int nAction = pActor->nAction;
seq_PlotSequence(ev->nParam, getSeqFromId(kSeqRex, RexSeq[nAction].a), pActor->nFrame, RexSeq[nAction].b);
seq_PlotSequence(ev->nParam, getSeqFromId(kSeqRex, RexSeq[nAction].nSeqId), pActor->nFrame, RexSeq[nAction].nFlags);
return;
}
@ -192,7 +192,7 @@ void AIRex::Tick(RunListEvent* ev)
Gravity(pActor);
int nSeq = getSeqFromId(kSeqRex, RexSeq[nAction].a);
int nSeq = getSeqFromId(kSeqRex, RexSeq[nAction].nSeqId);
pActor->spr.picnum = seq_GetSeqPicnum2(nSeq, pActor->nFrame);

4
source/games/exhumed/src/roach.cpp
View file

@ -110,7 +110,7 @@ void AIRoach::Draw(RunListEvent* ev)
if (!pActor) return;
int nAction = pActor->nAction;
seq_PlotSequence(ev->nParam, getSeqFromId(kSeqRoach, RoachSeq[nAction].a), pActor->nFrame, RoachSeq[nAction].b);
seq_PlotSequence(ev->nParam, getSeqFromId(kSeqRoach, RoachSeq[nAction].nSeqId), pActor->nFrame, RoachSeq[nAction].nFlags);
return;
}
@ -211,7 +211,7 @@ void AIRoach::Tick(RunListEvent* ev)
Gravity(pActor);
int nSeq = getSeqFromId(kSeqRoach, RoachSeq[nAction].a);
int nSeq = getSeqFromId(kSeqRoach, RoachSeq[nAction].nSeqId);
pActor->spr.picnum = seq_GetSeqPicnum2(nSeq, pActor->nFrame);
seq_MoveSequence(pActor, nSeq, pActor->nFrame);

4
source/games/exhumed/src/scorp.cpp
View file

@ -105,7 +105,7 @@ void AIScorp::Draw(RunListEvent* ev)
int nAction = pActor->nAction;
seq_PlotSequence(ev->nParam, getSeqFromId(kSeqScorp, ScorpSeq[nAction].a), pActor->nFrame, ScorpSeq[nAction].b);
seq_PlotSequence(ev->nParam, getSeqFromId(kSeqScorp, ScorpSeq[nAction].nSeqId), pActor->nFrame, ScorpSeq[nAction].nFlags);
}
//---------------------------------------------------------------------------
@ -206,7 +206,7 @@ void AIScorp::Tick(RunListEvent* ev)
Gravity(pActor);
}
int nSeq = getSeqFromId(kSeqScorp, ScorpSeq[nAction].a);
int nSeq = getSeqFromId(kSeqScorp, ScorpSeq[nAction].nSeqId);
pActor->spr.picnum = seq_GetSeqPicnum2(nSeq, pActor->nFrame);
seq_MoveSequence(pActor, nSeq, pActor->nFrame);

4
source/games/exhumed/src/sequence.h
View file

@ -104,8 +104,8 @@ enum {
struct actionSeq
{
int16_t a;
int16_t b;
int16_t nSeqId;
int16_t nFlags;
};
struct SeqFrameChunk

4
source/games/exhumed/src/set.cpp
View file

@ -248,7 +248,7 @@ void AISet::Draw(RunListEvent* ev)
if (!pActor) return;
int nAction = pActor->nAction;
seq_PlotSequence(ev->nParam, getSeqFromId(kSeqSet, SetSeq[nAction].a), pActor->nFrame, SetSeq[nAction].b);
seq_PlotSequence(ev->nParam, getSeqFromId(kSeqSet, SetSeq[nAction].nSeqId), pActor->nFrame, SetSeq[nAction].nFlags);
return;
}
@ -269,7 +269,7 @@ void AISet::Tick(RunListEvent* ev)
Gravity(pActor);
int nSeq = getSeqFromId(kSeqSet, SetSeq[nAction].a);
int nSeq = getSeqFromId(kSeqSet, SetSeq[nAction].nSeqId);
pActor->spr.picnum = seq_GetSeqPicnum2(nSeq, pActor->nFrame);
seq_MoveSequence(pActor, nSeq, pActor->nFrame);

4
source/games/exhumed/src/spider.cpp
View file

@ -117,7 +117,7 @@ void AISpider::Tick(RunListEvent* ev)
}
}
int nSeq = getSeqFromId(kSeqSpider, SpiderSeq[nAction].a);
int nSeq = getSeqFromId(kSeqSpider, SpiderSeq[nAction].nSeqId);
spp->spr.picnum = seq_GetSeqPicnum2(nSeq, spp->nFrame);
@ -354,7 +354,7 @@ void AISpider::Draw(RunListEvent* ev)
int nAction = spp->nAction;
seq_PlotSequence(ev->nParam, getSeqFromId(kSeqSpider, SpiderSeq[nAction].a), spp->nFrame, SpiderSeq[nAction].b);
seq_PlotSequence(ev->nParam, getSeqFromId(kSeqSpider, SpiderSeq[nAction].nSeqId), spp->nFrame, SpiderSeq[nAction].nFlags);
}
//---------------------------------------------------------------------------

4
source/games/exhumed/src/wasp.cpp
View file

@ -122,7 +122,7 @@ void AIWasp::Draw(RunListEvent* ev)
if (!pActor) return;
int nAction = pActor->nAction;
seq_PlotSequence(ev->nParam, getSeqFromId(kSeqWasp, WaspSeq[nAction].a), pActor->nFrame, WaspSeq[nAction].b);
seq_PlotSequence(ev->nParam, getSeqFromId(kSeqWasp, WaspSeq[nAction].nSeqId), pActor->nFrame, WaspSeq[nAction].nFlags);
return;
}
@ -214,7 +214,7 @@ void AIWasp::Tick(RunListEvent* ev)
bool bVal = false;
int nSeq = getSeqFromId(kSeqWasp, WaspSeq[nAction].a);
int nSeq = getSeqFromId(kSeqWasp, WaspSeq[nAction].nSeqId);
pActor->spr.picnum = seq_GetSeqPicnum2(nSeq, pActor->nFrame);