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 sequence texture getters to separate frame/chunks.

Browse source 
* This will make it easier to compare against the source if there's a mistake, etc.
This commit is contained in:
Mitchell Richters 2023-04-17 09:05:21 +10:00
parent 1162954b03
commit d309406473
22 changed files with 45 additions and 45 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -132,7 +132,7 @@ void AIAnubis::Tick(RunListEvent* ev)
seqFrame.playSound(ap);
ap->spr.setspritetexture(seqFrame.getFirstTexID());
ap->spr.setspritetexture(seqFrame.getFirstChunkTexture());
ap->nFrame++;
if (ap->nFrame >= anubisSeq.frames.Size())

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

@ -658,13 +658,13 @@ DExhumedActor* BuildBullet(DExhumedActor* pActor, int nType, double fZOffset, DA
{
pBullet->field_12 = 0;
pBullet->seqFile = pBulletInfo->initSeq;
pBulletActor->spr.setspritetexture(getSequence(pBullet->seqFile).getFirstTexID());
pBulletActor->spr.setspritetexture(getSequence(pBullet->seqFile).getFirstFrameTexture());
}
else if (pBulletInfo->seqFile != NAME_None)
{
pBullet->field_12 = 1;
pBullet->seqFile = pBulletInfo->seqFile;
pBulletActor->spr.setspritetexture(getSequence(pBullet->seqFile).getFirstTexID());
pBulletActor->spr.setspritetexture(getSequence(pBullet->seqFile).getFirstFrameTexture());
}
else
{

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

@ -90,7 +90,7 @@ void AIFishLimb::Tick(RunListEvent* ev)
const auto& fishSeq = getSequence(pActor->nSeqFile, pActor->nCount);
pActor->spr.setspritetexture(fishSeq.frames[pActor->nFrame].getFirstTexID());
pActor->spr.setspritetexture(fishSeq.frames[pActor->nFrame].getFirstChunkTexture());
Gravity(pActor);
@ -176,7 +176,7 @@ void BuildFish(DExhumedActor* pActor, const DVector3& pos, sectortype* pSector,
pActor->spr.xoffset = 0;
pActor->spr.yoffset = 0;
pActor->nSeqFile = "fish";
pActor->spr.setspritetexture(getSequence(pActor->nSeqFile, FishSeq[0].nSeqId).getFirstTexID());
pActor->spr.setspritetexture(getSequence(pActor->nSeqFile, FishSeq[0].nSeqId).getFirstFrameTexture());
pActor->vel.X = 0;
pActor->vel.Y = 0;
pActor->vel.Z = 0;
@ -361,7 +361,7 @@ void AIFish::Tick(RunListEvent* ev)
const auto& fishSeq = getSequence(pActor->nSeqFile, FishSeq[nAction].nSeqId);
const auto& seqFrame = fishSeq.frames[pActor->nFrame];
pActor->spr.setspritetexture(seqFrame.getFirstTexID());
pActor->spr.setspritetexture(seqFrame.getFirstChunkTexture());
seqFrame.playSound(pActor);

2
source/games/exhumed/src/grenade.cpp
View file

@ -262,7 +262,7 @@ void AIGrenade::Tick(RunListEvent* ev)
const auto& seqFrame = grenadeSeq.frames[pActor->nHealth >> 8];
seqFrame.playSound(pActor);
pActor->spr.setspritetexture(seqFrame.getFirstTexID());
pActor->spr.setspritetexture(seqFrame.getFirstChunkTexture());
pActor->nIndex2--;
if (!pActor->nIndex2)

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

@ -123,7 +123,7 @@ void BuildLava(DExhumedActor* pActor, const DVector3& pos, sectortype* pSector,
pActor->spr.xoffset = 0;
pActor->spr.yoffset = 0;
pActor->nSeqFile = "lavag";
pActor->spr.setspritetexture(getSequence(pActor->nSeqFile, LavadudeSeq[3].nSeqId).getFirstTexID());
pActor->spr.setspritetexture(getSequence(pActor->nSeqFile, LavadudeSeq[3].nSeqId).getFirstFrameTexture());
pActor->vel.X = 0;
pActor->vel.Y = 0;
pActor->vel.Z = 0;
@ -218,7 +218,7 @@ void AILavaDude::Tick(RunListEvent* ev)
const auto& lavadudeSeq = getSequence(pActor->nSeqFile, LavadudeSeq[nAction].nSeqId);
const auto& seqFrame = lavadudeSeq.frames[pActor->nFrame];
pActor->spr.setspritetexture(seqFrame.getFirstTexID());
pActor->spr.setspritetexture(seqFrame.getFirstChunkTexture());
int var_1C = 0;

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

@ -203,7 +203,7 @@ void AILion::Tick(RunListEvent* ev)
const auto& lionSeq = getSequence(pActor->nSeqFile, LionSeq[nAction].nSeqId);
const auto& seqFrame = lionSeq.frames[pActor->nFrame];
pActor->spr.setspritetexture(seqFrame.getFirstTexID());
pActor->spr.setspritetexture(seqFrame.getFirstChunkTexture());
seqFrame.playSound(pActor);

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

@ -144,7 +144,7 @@ void AIMummy::Tick(RunListEvent* ev)
const auto& mummySeq = getSequence(pActor->nSeqFile, MummySeq[nAction].nSeqId);
const auto& seqFrame = mummySeq.frames[pActor->nFrame];
pActor->spr.setspritetexture(seqFrame.getFirstTexID());
pActor->spr.setspritetexture(seqFrame.getFirstChunkTexture());
seqFrame.playSound(pActor);

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

@ -1962,7 +1962,7 @@ void AIObject::Tick(RunListEvent* ev)
if (++pActor->nFrame >= nSeqFrames.Size())
pActor->nFrame = 0;
pActor->spr.setspritetexture(nSeqFrames[pActor->nFrame].getFirstTexID());
pActor->spr.setspritetexture(nSeqFrames[pActor->nFrame].getFirstChunkTexture());
}
if (pActor->nHealth >= 0) {
@ -2009,7 +2009,7 @@ void AIObject::Tick(RunListEvent* ev)
if (nStat == kStatExplodeTrigger)
{
for (int i = 4; i < 8; i++) {
BuildCreatureChunk(pActor, firepotSeqs->operator[]((i >> 2) + 1).getFirstTexID(), true);
BuildCreatureChunk(pActor, firepotSeqs->operator[]((i >> 2) + 1).getFirstFrameTexture(), true);
}
runlist_RadialDamageEnemy(pActor, 200, 20);
@ -2017,7 +2017,7 @@ void AIObject::Tick(RunListEvent* ev)
else if (nStat == kStatExplodeTarget)
{
for (int i = 0; i < 8; i++) {
BuildCreatureChunk(pActor, firepotSeqs->operator[]((i >> 1) + 3).getFirstTexID(), true);
BuildCreatureChunk(pActor, firepotSeqs->operator[]((i >> 1) + 3).getFirstFrameTexture(), true);
}
}

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

@ -218,7 +218,7 @@ void RestartPlayer(int nPlayer)
pPlayerActor->nSeqFile = "joe";
pPlayerActor->nAction = 0;
pPlayerActor->nFrame = 0;
pPlayerActor->spr.setspritetexture(getSequence(pPlayerActor->nSeqFile, 18).getFirstTexID());
pPlayerActor->spr.setspritetexture(getSequence(pPlayerActor->nSeqFile, 18).getFirstFrameTexture());
pPlayerActor->spr.hitag = 0;
pPlayerActor->spr.extra = -1;
pPlayerActor->spr.lotag = runlist_HeadRun() + 1;
@ -642,7 +642,7 @@ void AIPlayer::Damage(RunListEvent* ev)
for (int i = 122; i <= 131; i++)
{
BuildCreatureChunk(pPlayerActor, joeSeqs->operator[](i).getFirstTexID());
BuildCreatureChunk(pPlayerActor, joeSeqs->operator[](i).getFirstFrameTexture());
}
StartDeathSeq(nPlayer, 1);
@ -1885,7 +1885,7 @@ static bool doPlayerDeathRestart(Player* const pPlayer)
if (pPlayer->pActor->nAction != 20)
{
const auto pPlayerActor = pPlayer->pActor;
pPlayerActor->spr.setspritetexture(getSequence("joe", 120).getFirstTexID());
pPlayerActor->spr.setspritetexture(getSequence("joe", 120).getFirstFrameTexture());
pPlayerActor->spr.cstat = 0;
pPlayerActor->spr.pos.Z = pPlayerActor->sector()->floorz;
}
@ -2011,7 +2011,7 @@ void AIPlayer::Tick(RunListEvent* ev)
const auto pPlayer = &PlayerList[nPlayer];
const auto pPlayerActor = pPlayer->pActor;
pPlayerActor->spr.setspritetexture(getSequence(pPlayerActor->nSeqFile, PlayerSeq[nHeightTemplate[pPlayerActor->nAction]].nSeqId).getFirstTexID());
pPlayerActor->spr.setspritetexture(getSequence(pPlayerActor->nSeqFile, PlayerSeq[nHeightTemplate[pPlayerActor->nAction]].nSeqId).getFirstFrameTexture());
pPlayer->pDoppleSprite->spr.picnum = pPlayerActor->spr.picnum;
doPlayerCounters(pPlayer);

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

@ -254,7 +254,7 @@ void BlowChunks(DExhumedActor* pActor)
for (int i = 0; i < 4; i++)
{
BuildCreatureChunk(pActor, spiderSeqs->operator[](i + 41).getFirstTexID());
BuildCreatureChunk(pActor, spiderSeqs->operator[](i + 41).getFirstFrameTexture());
}
}
@ -279,7 +279,7 @@ void DestroyEgg(int nEgg)
for (int i = 0; i < 4; i++)
{
BuildCreatureChunk(pActor, queeneggSeqs->operator[]((i % 2) + 24).getFirstTexID());
BuildCreatureChunk(pActor, queeneggSeqs->operator[]((i % 2) + 24).getFirstFrameTexture());
}
}
@ -550,7 +550,7 @@ void AIQueenEgg::Tick(RunListEvent* ev)
const auto& eggSeq = getSequence(pActor->nSeqFile, EggSeq[nAction].nSeqId);
const auto& seqFrame = eggSeq.frames[pEgg->nFrame];
pActor->spr.setspritetexture(seqFrame.getFirstTexID());
pActor->spr.setspritetexture(seqFrame.getFirstChunkTexture());
if (nAction != 4)
{
@ -813,7 +813,7 @@ void AIQueenHead::Tick(RunListEvent* ev)
seqFrame.playSound(pActor);
pActor->spr.setspritetexture(seqFrame.getFirstTexID());
pActor->spr.setspritetexture(seqFrame.getFirstChunkTexture());
QueenHead.nFrame++;
if (QueenHead.nFrame >= queenSeq.frames.Size())
@ -1244,7 +1244,7 @@ void AIQueen::Tick(RunListEvent* ev)
const auto& queenSeq = getSequence(pActor->nSeqFile, QueenSeq[nAction].nSeqId);
const auto& seqFrame = queenSeq.frames[QueenList[nQueen].nFrame];
pActor->spr.setspritetexture(seqFrame.getFirstTexID());
pActor->spr.setspritetexture(seqFrame.getFirstChunkTexture());
seqFrame.playSound(pActor);
@ -1444,7 +1444,7 @@ void AIQueen::Tick(RunListEvent* ev)
if (QueenList[nQueen].nIndex <= 0)
{
pActor->spr.cstat = 0;
const auto queenPicnum = getSequence("queen", 57).getFirstTexID();
const auto queenPicnum = getSequence("queen", 57).getFirstFrameTexture();
for (int i = 0; i < 20; i++)
{

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

@ -219,7 +219,7 @@ void AIRa::Tick(RunListEvent* ev)
bool bVal = false;
Ra[nPlayer].pTarget = PlayerList[nPlayer].pTarget;
pActor->spr.setspritetexture(seqFrame.getFirstTexID());
pActor->spr.setspritetexture(seqFrame.getFirstChunkTexture());
if (Ra[nPlayer].nAction)
{

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

@ -58,7 +58,7 @@ void SerializeRat(FSerializer& arc)
void InitRats()
{
nPlayerPic = getSequence("joe", 120).getFirstTexID();
nPlayerPic = getSequence("joe", 120).getFirstFrameTexture();
}
void SetRatVel(DExhumedActor* pActor)
@ -231,7 +231,7 @@ void AIRat::Tick(RunListEvent* ev)
const auto& ratSeq = getSequence(pActor->nSeqFile, RatSeq[nAction].nSeqId);
const auto& seqFrame = ratSeq.frames[pActor->nFrame];
pActor->spr.setspritetexture(seqFrame.getFirstTexID());
pActor->spr.setspritetexture(seqFrame.getFirstChunkTexture());
seqFrame.playSound(pActor);

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

@ -195,7 +195,7 @@ void AIRex::Tick(RunListEvent* ev)
const auto& rexSeq = getSequence(pActor->nSeqFile, RexSeq[nAction].nSeqId);
const auto& seqFrame = rexSeq.frames[pActor->nFrame];
pActor->spr.setspritetexture(seqFrame.getFirstTexID());
pActor->spr.setspritetexture(seqFrame.getFirstChunkTexture());
int ecx = 2;

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

@ -215,7 +215,7 @@ void AIRoach::Tick(RunListEvent* ev)
const auto& roachSeq = getSequence(pActor->nSeqFile, RoachSeq[nAction].nSeqId);
const auto& seqFrame = roachSeq.frames[pActor->nFrame];
pActor->spr.setspritetexture(seqFrame.getFirstTexID());
pActor->spr.setspritetexture(seqFrame.getFirstChunkTexture());
seqFrame.playSound(pActor);
pActor->nFrame++;

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

@ -210,7 +210,7 @@ void AIScorp::Tick(RunListEvent* ev)
const auto& scorpSeq = getSequence(pActor->nSeqFile, ScorpSeq[nAction].nSeqId);
const auto& seqFrame = scorpSeq.frames[pActor->nFrame];
pActor->spr.setspritetexture(seqFrame.getFirstTexID());
pActor->spr.setspritetexture(seqFrame.getFirstChunkTexture());
seqFrame.playSound(pActor);
pActor->nFrame++;

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

@ -317,16 +317,16 @@ void seq_LoadSequences()
}
}
nShadowPic = getSequence("shadow").getFirstTexID();
nShadowPic = getSequence("shadow").getFirstFrameTexture();
nShadowWidth = (int16_t)TexMan.GetGameTexture(nShadowPic)->GetDisplayWidth();
nFlameHeight = (int16_t)TexMan.GetGameTexture(getSequence("firepoof").getFirstTexID())->GetDisplayHeight();
nFlameHeight = (int16_t)TexMan.GetGameTexture(getSequence("firepoof").getFirstFrameTexture())->GetDisplayHeight();
nPilotLightCount = getSequence("flamer", 3).frames.Size();
nPilotLightFrame = 0;
const auto& fontSeq = getSequence("font2");
const int nFontFirstChar = legacyTileNum(fontSeq.getFirstTexID());
const int nFontFirstChar = legacyTileNum(fontSeq.getFirstFrameTexture());
for (unsigned i = 0; i < fontSeq.frames.Size(); i++)
{
@ -515,7 +515,7 @@ void seq_PlotSequence(const int nSprite, const FName seqFile, const int16_t seqI
{
pTSprite->setspritetexture(nShadowPic);
const auto nTexWidth = (int)TexMan.GetGameTexture(drawFrame.getFirstTexID())->GetDisplayWidth();
const auto nTexWidth = (int)TexMan.GetGameTexture(drawFrame.getFirstChunkTexture())->GetDisplayWidth();
const auto nScale = max(((nTexWidth << 5) / nShadowWidth) - int16_t((nFloorZ - pTSprite->pos.Z) * 2.), 1) * REPEAT_SCALE;
pTSprite->cstat = CSTAT_SPRITE_ALIGNMENT_FLOOR | CSTAT_SPRITE_TRANSLUCENT;

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

@ -41,7 +41,7 @@ struct SeqFrame
int16_t flags;
TArray<SeqFrameChunk> chunks;
const FTextureID getFirstTexID() const
const FTextureID getFirstChunkTexture() const
{
return chunks.Size() ? chunks[0].tex : FNullTextureID();
}
@ -67,9 +67,9 @@ struct Seq
int16_t flags;
TArray<SeqFrame> frames;
const FTextureID getFirstTexID() const
const FTextureID getFirstFrameTexture() const
{
return frames[0].getFirstTexID();
return frames[0].getFirstChunkTexture();
}
};

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

@ -116,7 +116,7 @@ void BuildSoul(DExhumedActor* pSet)
pActor->spr.xoffset = 0;
pActor->spr.yoffset = 0;
pActor->nSeqFile = "set";
pActor->spr.setspritetexture(getSequence(pActor->nSeqFile, 75).getFirstTexID());
pActor->spr.setspritetexture(getSequence(pActor->nSeqFile, 75).getFirstFrameTexture());
pActor->spr.Angles.Yaw = RandomAngle();
pActor->vel.X = 0;
pActor->vel.Y = 0;
@ -274,7 +274,7 @@ void AISet::Tick(RunListEvent* ev)
const auto& setSeq = getSequence(pActor->nSeqFile, SetSeq[nAction].nSeqId);
const auto& seqFrame = setSeq.frames[pActor->nFrame];
pActor->spr.setspritetexture(seqFrame.getFirstTexID());
pActor->spr.setspritetexture(seqFrame.getFirstChunkTexture());
seqFrame.playSound(pActor);
if (nAction == 3)
@ -612,7 +612,7 @@ void AISet::Tick(RunListEvent* ev)
if (seqFrame.flags & 0x80)
{
pActor->spr.pos.Z -= GetActorHeight(pActor);
BuildCreatureChunk(pActor, getSequence("set", 76).getFirstTexID());
BuildCreatureChunk(pActor, getSequence("set", 76).getFirstFrameTexture());
pActor->spr.pos.Z += GetActorHeight(pActor);
}

2
source/games/exhumed/src/snake.cpp
View file

@ -163,7 +163,7 @@ void BuildSnake(int nPlayer, double zVal)
auto pPlayerActor = PlayerList[nPlayer].pActor;
auto pViewSect = PlayerList[nPlayer].pPlayerViewSect;
auto nPic = getSequence("snakbody", 0).getFirstTexID();
auto nPic = getSequence("snakbody", 0).getFirstFrameTexture();
auto pos = pPlayerActor->spr.pos.plusZ(zVal - 10);

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

@ -122,7 +122,7 @@ void AISpider::Tick(RunListEvent* ev)
const auto& spiderSeq = getSequence(spp->nSeqFile, SpiderSeq[nAction].nSeqId);
const auto& seqFrame = spiderSeq.frames[spp->nFrame];
spp->spr.setspritetexture(seqFrame.getFirstTexID());
spp->spr.setspritetexture(seqFrame.getFirstChunkTexture());
seqFrame.playSound(spp);
@ -423,7 +423,7 @@ void AISpider::Damage(RunListEvent* ev)
for (int i = 0; i < 7; i++)
{
BuildCreatureChunk(spp, spiderSeqs->operator[](i + 41).getFirstTexID());
BuildCreatureChunk(spp, spiderSeqs->operator[](i + 41).getFirstFrameTexture());
}
}
}

2
source/games/exhumed/src/status.cpp
View file

@ -47,7 +47,7 @@ BEGIN_PS_NS
void UpdateFrame()
{
static const auto tex = TexMan.GetGameTexture(getSequence("backgrnd").getFirstTexID());
static const auto tex = TexMan.GetGameTexture(getSequence("backgrnd").getFirstFrameTexture());
twod->AddFlatFill(0, 0, twod->GetWidth(), viewport3d.Top() - 3, tex);
twod->AddFlatFill(0, viewport3d.Bottom() + 3, twod->GetWidth(), twod->GetHeight(), tex);

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

@ -213,7 +213,7 @@ void AIWasp::Tick(RunListEvent* ev)
const auto& waspSeq = getSequence(pActor->nSeqFile, WaspSeq[nAction].nSeqId);
const auto& seqFrame = waspSeq.frames[pActor->nFrame];
pActor->spr.setspritetexture(seqFrame.getFirstTexID());
pActor->spr.setspritetexture(seqFrame.getFirstChunkTexture());
seqFrame.playSound(pActor);