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: Convert out bullet system to new backend hashtable.

Browse source
This commit is contained in:
Mitchell Richters 2023-04-16 08:20:04 +10:00
parent 6f242b901d
commit 34e984d836
4 changed files with 71 additions and 75 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -61,8 +61,8 @@ struct bulletInfo
int16_t nDamage; // 0 int16_t nDamage; // 0
int16_t field_2; // 2 int16_t field_2; // 2
int field_4; // 4 int field_4; // 4
int16_t field_8; // 8 FName initSeq; // 8
int16_t nSeq; // 10 FName seqFile; // 10
FName animFile; // 12 FName animFile; // 12
int16_t nFlags; int16_t nFlags;
int16_t nRadius; // damage radius int16_t nRadius; // damage radius

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

@ -37,8 +37,8 @@ struct Bullet
TObjPtr<DExhumedActor*> pActor; TObjPtr<DExhumedActor*> pActor;
TObjPtr<DExhumedActor*> pEnemy; TObjPtr<DExhumedActor*> pEnemy;
int16_t nSeq; FName seqFile;
int16_t nFrame; uint16_t nFrame;
int16_t nRunRec; int16_t nRunRec;
int16_t nRunRec2; int16_t nRunRec2;
int16_t nType; int16_t nType;
@ -76,7 +76,7 @@ FSerializer& Serialize(FSerializer& arc, const char* keyname, Bullet& w, Bullet*
} }
if (arc.BeginObject(keyname)) if (arc.BeginObject(keyname))
{ {
arc("seq", w.nSeq, def->nSeq) arc("seq", w.seqFile, def->seqFile)
("frame", w.nFrame, def->nFrame) ("frame", w.nFrame, def->nFrame)
("sprite", w.pActor, def->pActor) ("sprite", w.pActor, def->pActor)
("type", w.nType, def->nType) ("type", w.nType, def->nType)
@ -107,23 +107,23 @@ void SerializeBullet(FSerializer& arc)
} }
bulletInfo BulletInfo[] = { bulletInfo BulletInfo[] = {
{ 25, 1, 20, -1, -1, "kapow", 0, 0, -1 }, { 25, 1, 20, NAME_None, NAME_None, "kapow", 0, 0, -1 },
{ 25, -1, 65000, -1, 31, "poof2", 0, 0, -1 }, { 25, -1, 65000, NAME_None, "bullet", "poof2", 0, 0, -1 },
{ 15, -1, 60000, -1, 31, "poof2", 0, 0, -1 }, { 15, -1, 60000, NAME_None, "bullet", "poof2", 0, 0, -1 },
{ 5, 15, 2000, -1, 14, "firepoof", 4, 5, 3 }, { 5, 15, 2000, NAME_None, "fireball", "firepoof", 4, 5, 3 },
{ 250, 100, 2000, -1, 33, "grenboom", 4, 20, -1 }, { 250, 100, 2000, NAME_None, "grenroll", "grenboom", 4, 20, -1 },
{ 200, -1, 2000, -1, 20, "cobrapow", 4, 10, -1 }, { 200, -1, 2000, NAME_None, "snakehed", "cobrapow", 4, 10, -1 },
{ 200, -1, 60000, 68, 68, NAME_None, -1, 0, -1 }, { 200, -1, 60000, NAME_None, "eyehit", NAME_None, -1, 0, -1 },
{ 300, 1, 0, -1, -1, NAME_None, 0, 50, -1 }, { 300, 1, 0, NAME_None, NAME_None, NAME_None, 0, 50, -1 },
{ 18, -1, 2000, -1, 18, "anupoof", 4, 0, -1 }, { 18, -1, 2000, NAME_None, "anuball", "anupoof", 4, 0, -1 },
{ 20, -1, 2000, 37, 11, "skulpoof", 4, 0, -1 }, { 20, -1, 2000, "skulstrt", "skull", "skulpoof", 4, 0, -1 },
{ 25, -1, 3000, -1, 44, "grenpow", 4, 15, 90 }, { 25, -1, 3000, NAME_None, "lavashot", "grenpow", 4, 15, 90 },
{ 30, -1, 1000, -1, 52, "setgblow", 4, 20, 48 }, { 30, -1, 1000, NAME_None, "setghost", "setgblow", 4, 20, 48 },
{ 20, -1, 3500, -1, 54, "bizzpoof", 4, 30, -1 }, { 20, -1, 3500, NAME_None, "bizztail", "bizzpoof", 4, 30, -1 },
{ 10, -1, 5000, -1, 57, "rochfire", 4, 0, -1 }, { 10, -1, 5000, NAME_None, "roacshot", "rochfire", 4, 0, -1 },
{ 40, -1, 1500, -1, 63, "firepoof", 4, 10, 40 }, { 40, -1, 1500, NAME_None, "firetrap", "firepoof", 4, 10, 40 },
{ 20, -1, 2000, -1, 60, "poof", 0, 0, -1 }, { 20, -1, 2000, NAME_None, "arrow", "poof", 0, 0, -1 },
{ 5, -1, 60000, -1, 31, "rochfire", 0, 0, -1 } { 5, -1, 60000, NAME_None, "bullet", "rochfire", 0, 0, -1 }
}; };
@ -357,7 +357,7 @@ int MoveBullet(int nBullet)
if (pBullet->field_E == 3) if (pBullet->field_E == 3)
{ {
pBullet->nSeq = 45; pBullet->seqFile = "smokebal";
pBullet->nFrame = 0; pBullet->nFrame = 0;
pActor->spr.scale = DVector2(0.625, 0.625); pActor->spr.scale = DVector2(0.625, 0.625);
pActor->spr.shade = 0; pActor->spr.shade = 0;
@ -654,24 +654,24 @@ DExhumedActor* BuildBullet(DExhumedActor* pActor, int nType, double fZOffset, DA
pBullet->field_E = pBulletInfo->field_2; pBullet->field_E = pBulletInfo->field_2;
pBullet->nFrame = 0; pBullet->nFrame = 0;
int nSeq; if (pBulletInfo->initSeq != NAME_None)
if (pBulletInfo->field_8 != -1)
{ {
pBullet->field_12 = 0; pBullet->field_12 = 0;
nSeq = pBulletInfo->field_8; pBullet->seqFile = pBulletInfo->initSeq;
pBulletActor->spr.picnum = getSequence(pBullet->seqFile)[0].chunks[0].picnum;
}
else if (pBulletInfo->seqFile != NAME_None)
{
pBullet->field_12 = 1;
pBullet->seqFile = pBulletInfo->seqFile;
pBulletActor->spr.picnum = getSequence(pBullet->seqFile)[0].chunks[0].picnum;
} }
else else
{ {
pBullet->field_12 = 1; pBullet->seqFile = NAME_None;
nSeq = pBulletInfo->nSeq;
} }
pBullet->nSeq = nSeq; if (pBullet->seqFile == FName("bullet")) {
pBulletActor->spr.picnum = seq_GetSeqPicnum(nSeq, 0, 0);
if (nSeq == kSeqBullet) {
pBulletActor->spr.cstat |= CSTAT_SPRITE_INVISIBLE; pBulletActor->spr.cstat |= CSTAT_SPRITE_INVISIBLE;
} }
@ -797,31 +797,35 @@ void AIBullet::Tick(RunListEvent* ev)
int nBullet = RunData[ev->nRun].nObjIndex; int nBullet = RunData[ev->nRun].nObjIndex;
assert(nBullet >= 0 && nBullet < kMaxBullets); assert(nBullet >= 0 && nBullet < kMaxBullets);
int nSeq = getSeqFromId(BulletList[nBullet].nSeq); const auto pBullet = &BulletList[nBullet];
if (pBullet->seqFile == NAME_None)
return;
const auto& bulletSeq = getSequence(pBullet->seqFile);
const auto& seqFrame = bulletSeq[pBullet->nFrame];
DExhumedActor* pActor = BulletList[nBullet].pActor; DExhumedActor* pActor = BulletList[nBullet].pActor;
int nFlag = getSeqFrameFlags(getSeqFrame(nSeq, BulletList[nBullet].nFrame)); playFrameSound(pActor, seqFrame);
seq_MoveSequence(pActor, nSeq, BulletList[nBullet].nFrame); if (seqFrame.flags & 0x80)
if (nFlag & 0x80)
{ {
BuildAnim(nullptr, "smokebal", 0, pActor->spr.pos, pActor->sector(), pActor->spr.scale.X, 0); BuildAnim(nullptr, "smokebal", 0, pActor->spr.pos, pActor->sector(), pActor->spr.scale.X, 0);
} }
BulletList[nBullet].nFrame++; pBullet->nFrame++;
if (BulletList[nBullet].nFrame >= getSeqFrameCount(nSeq)) if (pBullet->nFrame >= bulletSeq.Size())
{ {
if (!BulletList[nBullet].field_12) if (!pBullet->field_12)
{ {
BulletList[nBullet].nSeq = BulletInfo[BulletList[nBullet].nType].nSeq; pBullet->seqFile = BulletInfo[pBullet->nType].seqFile;
BulletList[nBullet].field_12++; pBullet->field_12++;
} }
BulletList[nBullet].nFrame = 0; pBullet->nFrame = 0;
} }
if (BulletList[nBullet].field_E != -1 && --BulletList[nBullet].field_E == 0) if (pBullet->field_E != -1 && --pBullet->field_E == 0)
{ {
DestroyBullet(nBullet); DestroyBullet(nBullet);
} }
@ -842,17 +846,20 @@ void AIBullet::Draw(RunListEvent* ev)
int nBullet = RunData[ev->nRun].nObjIndex; int nBullet = RunData[ev->nRun].nObjIndex;
assert(nBullet >= 0 && nBullet < kMaxBullets); assert(nBullet >= 0 && nBullet < kMaxBullets);
int nSeq = getSeqFromId(BulletList[nBullet].nSeq); const auto pBullet = &BulletList[nBullet];
if (pBullet->seqFile == NAME_None)
return;
ev->pTSprite->statnum = 1000; ev->pTSprite->statnum = 1000;
if (BulletList[nBullet].nType == 15) if (BulletList[nBullet].nType == 15)
{ {
seq_PlotArrowSequence(ev->nParam, nSeq, BulletList[nBullet].nFrame); seq_PlotArrowSequence(ev->nParam, pBullet->seqFile, 0, BulletList[nBullet].nFrame);
} }
else else
{ {
//seq_PlotSequence(ev->nParam, nSeq, BulletList[nBullet].nFrame, 0); seq_PlotSequence(ev->nParam, pBullet->seqFile, 0, BulletList[nBullet].nFrame, 0);
ev->pTSprite->ownerActor = nullptr; ev->pTSprite->ownerActor = nullptr;
} }
} }

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

@ -821,52 +821,41 @@ int seq_GetSeqPicnum(int16_t nSeq, int16_t edx, int16_t ebx)
// //
//--------------------------------------------------------------------------- //---------------------------------------------------------------------------
int seq_PlotArrowSequence(int nSprite, int16_t nSeq, int nVal) void seq_PlotArrowSequence(const int nSprite, const FName seqFile, const int16_t seqIndex, const int frameIndex)
{ {
tspritetype* pTSprite = mytspriteArray->get(nSprite); tspritetype* pTSprite = mytspriteArray->get(nSprite);
DAngle nAngle = (nCamerapos.XY() - pTSprite->pos.XY()).Angle();
int nSeqOffset = (((pTSprite->Angles.Yaw + DAngle90 + DAngle22_5 - nAngle).Buildang()) & kAngleMask) >> 8; const DAngle nAngle = (nCamerapos.XY() - pTSprite->pos.XY()).Angle();
const int seqOffset = (((pTSprite->Angles.Yaw + DAngle90 + DAngle22_5 - nAngle).Buildang()) & kAngleMask) >> 8;
int16_t nFrame = getSeqFrame(nSeq + nSeqOffset, nVal); const auto& seqFrame = getSequence(seqFile, seqIndex + seqOffset)[frameIndex];
const auto& frameChunk = seqFrame.chunks[0];
int16_t nFrameBase = getSeqFrameChunk(nFrame); auto nStat = pTSprite->cstat | CSTAT_SPRITE_YCENTER;
int16_t nFrameSize = getSeqFrameChunkCount(nFrame);
uint8_t nShade = pTSprite->shade; if (seqOffset & 3) {
auto nStat = pTSprite->cstat;
nStat |= CSTAT_SPRITE_YCENTER;
if (nSeqOffset & 3) {
nStat |= CSTAT_SPRITE_ALIGNMENT_WALL | CSTAT_SPRITE_YFLIP; nStat |= CSTAT_SPRITE_ALIGNMENT_WALL | CSTAT_SPRITE_YFLIP;
} }
else { else {
nStat &= ~(CSTAT_SPRITE_ALIGNMENT_WALL | CSTAT_SPRITE_YFLIP); nStat &= ~(CSTAT_SPRITE_ALIGNMENT_WALL | CSTAT_SPRITE_YFLIP);
} }
if (getSeqFrameFlags(nFrame) & 4) {
nShade -= 100;
}
pTSprite->cstat = nStat; pTSprite->cstat = nStat;
pTSprite->shade = nShade; pTSprite->shade = (seqFrame.flags & 4) ? pTSprite->shade - 100 : pTSprite->shade;
pTSprite->statnum = nFrameSize; pTSprite->statnum = seqFrame.chunks.Size();
if (getSeqFrameChunkFlags(nFrameBase) & 1) if (frameChunk.flags & 1)
{ {
pTSprite->xoffset = (int8_t)getSeqFrameChunkPosX(nFrameBase); pTSprite->xoffset = (int8_t)frameChunk.xpos;
pTSprite->cstat |= CSTAT_SPRITE_XFLIP; pTSprite->cstat |= CSTAT_SPRITE_XFLIP;
} }
else else
{ {
pTSprite->xoffset = (int8_t)-getSeqFrameChunkPosX(nFrameBase); pTSprite->xoffset = (int8_t)-frameChunk.xpos;
} }
pTSprite->yoffset = -getSeqFrameChunkPosY(nFrameBase); pTSprite->yoffset = -frameChunk.ypos;
pTSprite->picnum = getSeqFrameChunkPicnum(nFrameBase); pTSprite->picnum = frameChunk.picnum;
return getSeqFrameChunkPicnum(nFrameBase);
} }
//--------------------------------------------------------------------------- //---------------------------------------------------------------------------

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

@ -144,7 +144,7 @@ void seq_DrawStatusSequence(int16_t nSequence, uint16_t edx, int16_t ebx);
int seq_DrawGunSequence(int nSeqOffset, int16_t dx, double xOffs, double yOffs, int nShade, int nPal, DAngle angle, bool align = false); int seq_DrawGunSequence(int nSeqOffset, int16_t dx, double xOffs, double yOffs, int nShade, int nPal, DAngle angle, bool align = false);
void seq_PlotSequence(const int nSprite, const FName seqFile, const int16_t seqIndex, const int16_t frameIndex, const int16_t nFlags); void seq_PlotSequence(const int nSprite, const FName seqFile, const int16_t seqIndex, const int16_t frameIndex, const int16_t nFlags);
int seq_PlotArrowSequence(int nSprite, int16_t nSeq, int nVal); void seq_PlotArrowSequence(const int nSprite, const FName seqFile, const int16_t seqIndex, const int frameIndex);
void seq_DrawPilotLightSeq(double xOffset, double yOffset); void seq_DrawPilotLightSeq(double xOffset, double yOffset);
int getSeqFromId(const int nSeqFileId, const int nSeq = 0); int getSeqFromId(const int nSeqFileId, const int nSeq = 0);