zdoom/raze
0
0
Fork 0
mirror of https://github.com/ZDoom/Raze.git synced 2025-05-31 01:11:15 +00:00
Code Issues Projects Releases Packages Wiki Activity

- refactored Anim to use actors.

Browse source
This commit is contained in:
Christoph Oelckers 2021-10-24 20:21:27 +02:00
parent 3b0df0e9b4
commit 5cc1a8934e
6 changed files with 75 additions and 149 deletions
Download patch file Download diff file Expand all files Collapse all files

24
source/games/exhumed/src/aistuff.h
View file

@ -25,29 +25,9 @@ BEGIN_PS_NS
// anims // anims
struct Anim
{
short nIndex2;
short nIndex;
short field_4;
short nSprite;
short nRun;
uint8_t nAction;
};
enum { kMaxAnims = 400 };
extern FreeListArray<Anim, kMaxAnims> AnimList;
void InitAnims(); void InitAnims();
void DestroyAnim(int nAnim); void DestroyAnim(DExhumedActor* nAnim);
int BuildAnim(int nSprite, int val, int val2, int x, int y, int z, int nSector, int nRepeat, int nFlag); DExhumedActor* BuildAnim(DExhumedActor* actor, int val, int val2, int x, int y, int z, int nSector, int nRepeat, int nFlag);
int BuildAnim(DExhumedActor* nSprite, int val, int val2, int x, int y, int z, int nSector, int nRepeat, int nFlag)
{
return BuildAnim(nSprite? nSprite->GetSpriteIndex() : -1, val, val2, x, y, z, nSector, nRepeat, nFlag);
}
short GetAnimSprite(short nAnim);
void FuncAnim(int, int, int, int); void FuncAnim(int, int, int, int);
void BuildExplosion(DExhumedActor* actor); void BuildExplosion(DExhumedActor* actor);

125
source/games/exhumed/src/anims.cpp
View file

@ -28,24 +28,9 @@ BEGIN_PS_NS
short nMagicSeq = -1; short nMagicSeq = -1;
short nPreMagicSeq = -1; short nPreMagicSeq = -1;
short nSavePointSeq = -1; short nSavePointSeq = -1;
FreeListArray<Anim, kMaxAnims> AnimList; //FreeListArray<Anim, kMaxAnims> AnimList;
FSerializer& Serialize(FSerializer& arc, const char* keyname, Anim& w, Anim* def)
{
if (arc.BeginObject(keyname))
{
arc("seq", w.nIndex2)
("val1", w.nIndex)
("val2", w.field_4)
("sprite", w.nSprite)
("runrec", w.nRun)
("flags", w.nAction)
.EndObject();
}
return arc;
}
void SerializeAnim(FSerializer& arc) void SerializeAnim(FSerializer& arc)
{ {
if (arc.BeginObject("anims")) if (arc.BeginObject("anims"))
@ -53,48 +38,36 @@ void SerializeAnim(FSerializer& arc)
arc("magic", nMagicSeq) arc("magic", nMagicSeq)
("premagic", nPreMagicSeq) ("premagic", nPreMagicSeq)
("savepoint", nSavePointSeq) ("savepoint", nSavePointSeq)
("list", AnimList)
.EndObject(); .EndObject();
} }
} }
void InitAnims() void InitAnims()
{ {
AnimList.Clear();
nMagicSeq = SeqOffsets[kSeqItems] + 21; nMagicSeq = SeqOffsets[kSeqItems] + 21;
nPreMagicSeq = SeqOffsets[kSeqMagic2]; nPreMagicSeq = SeqOffsets[kSeqMagic2];
nSavePointSeq = SeqOffsets[kSeqItems] + 12; nSavePointSeq = SeqOffsets[kSeqItems] + 12;
} }
void DestroyAnim(int nAnim) void DestroyAnim(DExhumedActor* pActor)
{ {
auto pActor = &AnimList[nAnim]; if (pActor)
short nSprite = pActor->nSprite;
if (nSprite >= 0)
{ {
auto pSprite = &sprite[nSprite]; auto pSprite = &pActor->s();
StopSpriteSound(nSprite); StopActorSound(pActor);
runlist_SubRunRec(pActor->nRun); runlist_SubRunRec(pActor->nRun);
runlist_DoSubRunRec(pSprite->extra); runlist_DoSubRunRec(pSprite->extra);
runlist_FreeRun(pSprite->lotag - 1); runlist_FreeRun(pSprite->lotag - 1);
DeleteActor(pActor);
} }
AnimList.Release(nAnim);
} }
int BuildAnim(int nSprite, int val, int val2, int x, int y, int z, int nSector, int nRepeat, int nFlag) DExhumedActor* BuildAnim(DExhumedActor* pActor, int val, int val2, int x, int y, int z, int nSector, int nRepeat, int nFlag)
{ {
int nAnim = AnimList.Get(); if (pActor == nullptr) {
if (nAnim < 0) { pActor = insertActor(nSector, 500);
return -1;
}
auto pActor = &AnimList[nAnim];
if (nSprite == -1) {
nSprite = insertsprite(nSector, 500);
} }
auto pSprite = &sprite[nSprite]; auto pSprite = &pActor->s();
pSprite->x = x; pSprite->x = x;
pSprite->y = y; pSprite->y = y;
@ -131,53 +104,44 @@ int BuildAnim(int nSprite, int val, int val2, int x, int y, int z, int nSector,
pSprite->lotag = runlist_HeadRun() + 1; pSprite->lotag = runlist_HeadRun() + 1;
pSprite->owner = -1; pSprite->owner = -1;
pSprite->extra = runlist_AddRunRec(pSprite->lotag - 1, nAnim, 0x100000); pSprite->extra = runlist_AddRunRec(pSprite->lotag - 1, pActor, 0x100000);
pActor->nRun = runlist_AddRunRec(NewRun, nAnim, 0x100000); pActor->nRun = runlist_AddRunRec(NewRun, pActor, 0x100000);
pActor->nSprite = nSprite;
pActor->nAction = nFlag; pActor->nAction = nFlag;
pActor->nIndex = 0; pActor->nIndex = 0;
pActor->nIndex2 = SeqOffsets[val] + val2; pActor->nIndex2 = SeqOffsets[val] + val2;
pActor->field_4 = 256; pActor->pTarget = nullptr;
if (nFlag & 0x80) { if (nFlag & 0x80) {
pSprite->cstat |= 0x2; // set transluscence pSprite->cstat |= 0x2; // set transluscence
} }
return nAnim; return pActor;
}
short GetAnimSprite(short nAnim)
{
auto pActor = &AnimList[nAnim];
return pActor->nSprite;
} }
void AIAnim::Tick(RunListEvent* ev) void AIAnim::Tick(RunListEvent* ev)
{ {
short nAnim = RunData[ev->nRun].nObjIndex; auto pActor = ev->pObjActor;
assert(nAnim >= 0 && nAnim < kMaxAnims); if (!pActor) return;
auto pActor = &AnimList[nAnim];
short nSprite = pActor->nSprite; //short nSprite = pActor->nSprite;
short nSeq = pActor->nIndex2; short nIndex2 = pActor->nIndex2;
auto pSprite = &sprite[nSprite]; auto pSprite = &pActor->s();
assert(nSprite != -1); short nIndex = pActor->nIndex;
short var_1C = pActor->nIndex;
if (!(pSprite->cstat & 0x8000)) if (!(pSprite->cstat & 0x8000))
{ {
seq_MoveSequence(nSprite, nSeq, var_1C); seq_MoveSequence(pActor, nIndex2, nIndex);
} }
if (pSprite->statnum == kStatIgnited) if (pSprite->statnum == kStatIgnited)
{ {
short nSpriteB = pSprite->hitag; auto pIgniter = pActor->pTarget;
if (nSpriteB > -1)
if (pIgniter)
{ {
auto pSpriteB = &sprite[nSpriteB]; auto pSpriteB = &pActor->pTarget->s();
pSprite->x = pSpriteB->x; pSprite->x = pSpriteB->x;
pSprite->y = pSpriteB->y; pSprite->y = pSpriteB->y;
pSprite->z = pSpriteB->z; pSprite->z = pSpriteB->z;
@ -186,17 +150,16 @@ void AIAnim::Tick(RunListEvent* ev)
{ {
if (pSpriteB->sectnum < 0 || pSpriteB->sectnum >= kMaxSectors) if (pSpriteB->sectnum < 0 || pSpriteB->sectnum >= kMaxSectors)
{ {
DestroyAnim(nAnim); DestroyAnim(pActor);
mydeletesprite(nSprite);
return; return;
} }
else else
{ {
mychangespritesect(nSprite, pSpriteB->sectnum); ChangeActorSect(pActor, pSpriteB->sectnum);
} }
} }
if (!var_1C) if (!nIndex)
{ {
if (pSpriteB->cstat != 0x8000) if (pSpriteB->cstat != 0x8000)
{ {
@ -205,7 +168,7 @@ void AIAnim::Tick(RunListEvent* ev)
if (hitag2 >= 15) if (hitag2 >= 15)
{ {
runlist_DamageEnemy(nSpriteB, -1, (pSpriteB->hitag - 14) * 2); runlist_DamageEnemy(pIgniter, nullptr, (pSpriteB->hitag - 14) * 2);
if (pSpriteB->shade < 100) if (pSpriteB->shade < 100)
{ {
@ -215,44 +178,40 @@ void AIAnim::Tick(RunListEvent* ev)
if (!(pSpriteB->cstat & 101)) if (!(pSpriteB->cstat & 101))
{ {
DestroyAnim(nAnim); DestroyAnim(pActor);
mydeletesprite(nSprite);
return; return;
} }
} }
else else
{ {
pSpriteB->hitag = 1; pSpriteB->hitag = 1;
DestroyAnim(nAnim); DestroyAnim(pActor);
mydeletesprite(nSprite);
} }
} }
else else
{ {
pSpriteB->hitag = 1; pSpriteB->hitag = 1;
DestroyAnim(nAnim); DestroyAnim(pActor);
mydeletesprite(nSprite);
} }
} }
} }
} }
pActor->nIndex++; pActor->nIndex++;
if (pActor->nIndex >= SeqSize[nSeq]) if (pActor->nIndex >= SeqSize[nIndex2])
{ {
if (pActor->nAction & 0x10) if (pActor->nAction & 0x10)
{ {
pActor->nIndex = 0; pActor->nIndex = 0;
} }
else if (nSeq == nPreMagicSeq) else if (nIndex2 == nPreMagicSeq)
{ {
pActor->nIndex = 0; pActor->nIndex = 0;
pActor->nIndex2 = nMagicSeq; pActor->nIndex2 = nMagicSeq;
short nAnimSprite = pActor->nSprite;
pActor->nAction |= 0x10; pActor->nAction |= 0x10;
sprite[nAnimSprite].cstat |= 2; pSprite->cstat |= 2;
} }
else if (nSeq == nSavePointSeq) else if (nIndex2 == nSavePointSeq)
{ {
pActor->nIndex = 0; pActor->nIndex = 0;
pActor->nIndex2++; pActor->nIndex2++;
@ -260,20 +219,18 @@ void AIAnim::Tick(RunListEvent* ev)
} }
else else
{ {
DestroyAnim(nAnim); DestroyAnim(pActor);
mydeletesprite(nSprite);
} }
} }
} }
void AIAnim::Draw(RunListEvent* ev) void AIAnim::Draw(RunListEvent* ev)
{ {
short nAnim = RunData[ev->nRun].nObjIndex; auto pActor = ev->pObjActor;
assert(nAnim >= 0 && nAnim < kMaxAnims); if (!pActor) return;
auto pActor = &AnimList[nAnim]; short nIndex2 = pActor->nIndex2;
short nSeq = pActor->nIndex2;
seq_PlotSequence(ev->nParam, nSeq, pActor->nIndex, 0x101); seq_PlotSequence(ev->nParam, nIndex2, pActor->nIndex, 0x101);
ev->pTSprite->owner = -1; ev->pTSprite->owner = -1;
} }

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

@ -164,17 +164,19 @@ void IgniteSprite(int nSprite)
pSprite->hitag += 2; pSprite->hitag += 2;
int nAnim = BuildAnim(-1, 38, 0, pSprite->x, pSprite->y, pSprite->z, pSprite->sectnum, 40, 20); auto pAnimActor = BuildAnim(nullptr, 38, 0, pSprite->x, pSprite->y, pSprite->z, pSprite->sectnum, 40, 20);
short nAnimSprite = GetAnimSprite(nAnim);
if (pAnimActor)
{
pAnimActor->pTarget = &exhumedActors[nSprite];
ChangeActorStat(pAnimActor, kStatIgnited);
sprite[nAnimSprite].hitag = nSprite; short yRepeat = (tileHeight(pAnimActor->s().picnum) * 32) / nFlameHeight;
changespritestat(nAnimSprite, kStatIgnited); if (yRepeat < 1)
yRepeat = 1;
short yRepeat = (tileHeight(sprite[nAnimSprite].picnum) * 32) / nFlameHeight; pAnimActor->s().yrepeat = (uint8_t)yRepeat;
if (yRepeat < 1) }
yRepeat = 1;
sprite[nAnimSprite].yrepeat = (uint8_t)yRepeat;
} }
void BulletHitsSprite(Bullet *pBullet, short nBulletSprite, short nHitSprite, int x, int y, int z, int nSector) void BulletHitsSprite(Bullet *pBullet, short nBulletSprite, short nHitSprite, int x, int y, int z, int nSector)

37
source/games/exhumed/src/items.cpp
View file

@ -128,17 +128,15 @@ void BuildItemAnim(short nSprite)
if (nItemAnimInfo[nItem].a >= 0) if (nItemAnimInfo[nItem].a >= 0)
{ {
int nAnim = BuildAnim(nSprite, 41, nItemAnimInfo[nItem].a, pSprite->x, pSprite->y, pSprite->z, pSprite->sectnum, nItemAnimInfo[nItem].repeat, 20); auto pAnimActor = BuildAnim(&exhumedActors[nSprite], 41, nItemAnimInfo[nItem].a, pSprite->x, pSprite->y, pSprite->z, pSprite->sectnum, nItemAnimInfo[nItem].repeat, 20);
int nAnimSprite = GetAnimSprite(nAnim);
if (nItem == 44) { if (nItem == 44) {
sprite[nAnimSprite].cstat |= 2; pAnimActor->s().cstat |= 2;
} }
changespritestat(nAnimSprite, pSprite->statnum); ChangeActorStat(pAnimActor, pSprite->statnum);
pAnimActor->s().hitag = pSprite->hitag;
sprite[nAnimSprite].owner = nAnim; pSprite->owner = 0;
sprite[nAnimSprite].hitag = pSprite->hitag;
} }
else else
{ {
@ -150,13 +148,8 @@ void BuildItemAnim(short nSprite)
void DestroyItemAnim(short nSprite) void DestroyItemAnim(short nSprite)
{ {
auto pSprite = &sprite[nSprite]; if (sprite[nSprite].owner == 0)
DestroyAnim(&exhumedActors[nSprite]);
short nAnim = pSprite->owner;
if (nAnim >= 0) {
DestroyAnim(nAnim);
}
} }
void ItemFlash() void ItemFlash()
@ -349,8 +342,8 @@ void DropMagic(short nSprite)
if (nMagicCount <= 0) if (nMagicCount <= 0)
{ {
int nAnim = BuildAnim( auto pAnimActor = BuildAnim(
-1, nullptr,
64, 64,
0, 0,
pSprite->x, pSprite->x,
@ -360,13 +353,11 @@ void DropMagic(short nSprite)
48, 48,
4); 4);
int nAnimSprite = GetAnimSprite(nAnim); if (pAnimActor)
{
sprite[nAnimSprite].owner = nAnim; AddFlash(pAnimActor->s().sectnum, pAnimActor->s().x, pAnimActor->s().y, pAnimActor->s().z, 128);
ChangeActorStat(pAnimActor, 950);
AddFlash(sprite[nAnimSprite].sectnum, sprite[nAnimSprite].x, sprite[nAnimSprite].y, sprite[nAnimSprite].z, 128); }
changespritestat(nAnimSprite, 950);
nMagicCount = RandomSize(2); nMagicCount = RandomSize(2);
} }
} }

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

@ -1362,11 +1362,7 @@ DExhumedActor* GrabBodyGunSprite()
else else
{ {
pSprite = &pActor->s(); pSprite = &pActor->s();
int nAnim = pSprite->owner; DestroyAnim(pActor);
if (nAnim != -1) {
DestroyAnim(nAnim);
}
pSprite->lotag = -1; pSprite->lotag = -1;
pSprite->owner = -1; pSprite->owner = -1;

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

@ -1372,7 +1372,8 @@ sectdone:
feebtag(pPlayerSprite->x, pPlayerSprite->y, pPlayerSprite->z, pPlayerSprite->sectnum, feebtag(pPlayerSprite->x, pPlayerSprite->y, pPlayerSprite->z, pPlayerSprite->sectnum,
&nValB, var_30, 768); &nValB, var_30, 768);
auto pSprite = &sprite[nValB]; auto pActor = &exhumedActors[nValB];
auto pSprite = &pActor->s();
// Item pickup code // Item pickup code
if (nValB >= 0 && pSprite->statnum >= 900) if (nValB >= 0 && pSprite->statnum >= 900)
{ {
@ -2256,12 +2257,11 @@ sectdone:
{ {
if (nLocalPlayer == nPlayer) if (nLocalPlayer == nPlayer)
{ {
short nAnim = pSprite->owner; pActor->nIndex2++;
AnimList[nAnim].nIndex2++; pActor->nAction &= 0xEF;
AnimList[nAnim].nAction &= 0xEF; pActor->nIndex = 0;
AnimList[nAnim].nIndex = 0;
changespritestat(nValB, 899); ChangeActorStat(pActor, 899);
} }
SetSavePoint(nPlayer, pPlayerSprite->x, pPlayerSprite->y, pPlayerSprite->z, pPlayerSprite->sectnum, pPlayerSprite->ang); SetSavePoint(nPlayer, pPlayerSprite->x, pPlayerSprite->y, pPlayerSprite->z, pPlayerSprite->sectnum, pPlayerSprite->ang);