zdoom/raze-gles
0
0
Fork 0
mirror of https://github.com/ZDoom/raze-gles.git synced 2025-01-14 11:50:49 +00:00
Code Issues Projects Releases Packages Wiki Activity

- Exhumed: Roach.

Browse source
This commit is contained in:
Christoph Oelckers 2020-11-29 20:47:55 +01:00
parent 4f1999ab24
commit cf5982b3fc
2 changed files with 66 additions and 53 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

117
source/exhumed/src/roach.cpp
View file

@ -24,10 +24,6 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
BEGIN_PS_NS BEGIN_PS_NS
enum { kMaxRoach = 100 };
int16_t RoachCount = -1;
static actionSeq RoachSeq[] = { static actionSeq RoachSeq[] = {
{24, 0}, {24, 0},
{0, 0}, {0, 0},
@ -41,37 +37,52 @@ static actionSeq RoachSeq[] = {
struct Roach struct Roach
{ {
short nHealth; short nHealth;
short field_2; short nFrame;
short nAction; short nAction;
short nSprite; short nSprite;
short nTarget; short nTarget;
short field_A; short nRun;
short field_C; short nCount;
short field_E; short nIndex;
}; };
Roach RoachList[kMaxRoach]; TArray<Roach> RoachList;
FSerializer& Serialize(FSerializer& arc, const char* keyname, Roach& w, Roach* def)
{
if (arc.BeginObject(keyname))
{
arc("health", w.nHealth)
("frame", w.nFrame)
("action", w.nAction)
("sprite", w.nSprite)
("target", w.nTarget)
("run", w.nRun)
("count", w.nCount)
("index", w.nIndex)
.EndObject();
}
return arc;
}
void SerializeRoach(FSerializer& arc)
{
arc("roach", RoachList);
}
static SavegameHelper sghroach("roach",
SV(RoachCount),
SA(RoachList),
nullptr);
/* Kilmaat Sentry */ /* Kilmaat Sentry */
void InitRoachs() void InitRoachs()
{ {
RoachCount = kMaxRoach; RoachList.Clear();
} }
// TODO - make nType a bool? // TODO - make nType a bool?
int BuildRoach(int nType, int nSprite, int x, int y, int z, short nSector, int angle) int BuildRoach(int nType, int nSprite, int x, int y, int z, short nSector, int angle)
{ {
RoachCount--; auto RoachCount = RoachList.Reserve(1);
if (RoachCount < 0) {
return -1;
}
if (nSprite == -1) if (nSprite == -1)
{ {
@ -120,13 +131,13 @@ int BuildRoach(int nType, int nSprite, int x, int y, int z, short nSector, int a
} }
RoachList[RoachCount].nSprite = nSprite; RoachList[RoachCount].nSprite = nSprite;
RoachList[RoachCount].field_2 = 0; RoachList[RoachCount].nFrame = 0;
RoachList[RoachCount].field_C = 0; RoachList[RoachCount].nCount = 0;
RoachList[RoachCount].nTarget = -1; RoachList[RoachCount].nTarget = -1;
RoachList[RoachCount].nHealth = 600; RoachList[RoachCount].nHealth = 600;
sprite[nSprite].owner = runlist_AddRunRec(sprite[nSprite].lotag - 1, RoachCount | 0x1C0000); sprite[nSprite].owner = runlist_AddRunRec(sprite[nSprite].lotag - 1, RoachCount | 0x1C0000);
RoachList[RoachCount].field_A = runlist_AddRunRec(NewRun, RoachCount | 0x1C0000); RoachList[RoachCount].nRun = runlist_AddRunRec(NewRun, RoachCount | 0x1C0000);
nCreaturesTotal++; nCreaturesTotal++;
@ -142,7 +153,7 @@ void GoRoach(short nSprite)
void FuncRoach(int a, int nDamage, int nRun) void FuncRoach(int a, int nDamage, int nRun)
{ {
short nRoach = RunData[nRun].nVal; short nRoach = RunData[nRun].nVal;
assert(nRoach >= 0 && nRoach < kMaxRoach); assert(nRoach >= 0 && nRoach < (int)RoachList.Size());
short nSprite = RoachList[nRoach].nSprite; short nSprite = RoachList[nRoach].nSprite;
short nAction = RoachList[nRoach].nAction; short nAction = RoachList[nRoach].nAction;
@ -161,7 +172,7 @@ void FuncRoach(int a, int nDamage, int nRun)
case 0x90000: case 0x90000:
{ {
seq_PlotSequence(a & 0xFFFF, RoachSeq[nAction].a + SeqOffsets[kSeqRoach], RoachList[nRoach].field_2, RoachSeq[nAction].b); seq_PlotSequence(a & 0xFFFF, RoachSeq[nAction].a + SeqOffsets[kSeqRoach], RoachList[nRoach].nFrame, RoachSeq[nAction].b);
return; return;
} }
@ -192,7 +203,7 @@ void FuncRoach(int a, int nDamage, int nRun)
{ {
DropMagic(nSprite); DropMagic(nSprite);
RoachList[nRoach].nAction = 5; RoachList[nRoach].nAction = 5;
RoachList[nRoach].field_2 = 0; RoachList[nRoach].nFrame = 0;
} }
nCreaturesKilled++; // NOTE: This was incrementing in original code. Bug? nCreaturesKilled++; // NOTE: This was incrementing in original code. Bug?
@ -210,14 +221,14 @@ void FuncRoach(int a, int nDamage, int nRun)
{ {
RoachList[nRoach].nAction = 2; RoachList[nRoach].nAction = 2;
GoRoach(nSprite); GoRoach(nSprite);
RoachList[nRoach].field_2 = 0; RoachList[nRoach].nFrame = 0;
} }
else else
{ {
if (!RandomSize(4)) if (!RandomSize(4))
{ {
RoachList[nRoach].nAction = 4; RoachList[nRoach].nAction = 4;
RoachList[nRoach].field_2 = 0; RoachList[nRoach].nFrame = 0;
} }
} }
} }
@ -233,17 +244,17 @@ void FuncRoach(int a, int nDamage, int nRun)
int nSeq = SeqOffsets[kSeqRoach] + RoachSeq[RoachList[nRoach].nAction].a; int nSeq = SeqOffsets[kSeqRoach] + RoachSeq[RoachList[nRoach].nAction].a;
sprite[nSprite].picnum = seq_GetSeqPicnum2(nSeq, RoachList[nRoach].field_2); sprite[nSprite].picnum = seq_GetSeqPicnum2(nSeq, RoachList[nRoach].nFrame);
seq_MoveSequence(nSprite, nSeq, RoachList[nRoach].field_2); seq_MoveSequence(nSprite, nSeq, RoachList[nRoach].nFrame);
RoachList[nRoach].field_2++; RoachList[nRoach].nFrame++;
if (RoachList[nRoach].field_2 >= SeqSize[nSeq]) if (RoachList[nRoach].nFrame >= SeqSize[nSeq])
{ {
bVal = true; bVal = true;
RoachList[nRoach].field_2 = 0; RoachList[nRoach].nFrame = 0;
} }
int nFlag = FrameFlag[SeqBase[nSeq] + RoachList[nRoach].field_2]; int nFlag = FrameFlag[SeqBase[nSeq] + RoachList[nRoach].nFrame];
short nTarget = RoachList[nRoach].nTarget; short nTarget = RoachList[nRoach].nTarget;
if (nAction > 5) { if (nAction > 5) {
@ -254,16 +265,16 @@ void FuncRoach(int a, int nDamage, int nRun)
{ {
case 0: case 0:
{ {
if (RoachList[nRoach].field_2 == 1) if (RoachList[nRoach].nFrame == 1)
{ {
RoachList[nRoach].field_C--; RoachList[nRoach].nCount--;
if (RoachList[nRoach].field_C <= 0) if (RoachList[nRoach].nCount <= 0)
{ {
RoachList[nRoach].field_C = RandomSize(6); RoachList[nRoach].nCount = RandomSize(6);
} }
else else
{ {
RoachList[nRoach].field_2 = 0; RoachList[nRoach].nFrame = 0;
} }
} }
@ -273,7 +284,7 @@ void FuncRoach(int a, int nDamage, int nRun)
if (nTarget >= 0) if (nTarget >= 0)
{ {
RoachList[nRoach].nAction = 2; RoachList[nRoach].nAction = 2;
RoachList[nRoach].field_2 = 0; RoachList[nRoach].nFrame = 0;
RoachList[nRoach].nTarget = nTarget; RoachList[nRoach].nTarget = nTarget;
GoRoach(nSprite); GoRoach(nSprite);
} }
@ -291,7 +302,7 @@ void FuncRoach(int a, int nDamage, int nRun)
if (nTarget >= 0) if (nTarget >= 0)
{ {
RoachList[nRoach].nAction = 2; RoachList[nRoach].nAction = 2;
RoachList[nRoach].field_2 = 0; RoachList[nRoach].nFrame = 0;
RoachList[nRoach].nTarget = nTarget; RoachList[nRoach].nTarget = nTarget;
GoRoach(nSprite); GoRoach(nSprite);
} }
@ -315,14 +326,14 @@ void FuncRoach(int a, int nDamage, int nRun)
if ((nMov & 0x3FFF) == nTarget) if ((nMov & 0x3FFF) == nTarget)
{ {
// repeated below // repeated below
RoachList[nRoach].field_E = RandomSize(2) + 1; RoachList[nRoach].nIndex = RandomSize(2) + 1;
RoachList[nRoach].nAction = 3; RoachList[nRoach].nAction = 3;
sprite[nSprite].xvel = 0; sprite[nSprite].xvel = 0;
sprite[nSprite].yvel = 0; sprite[nSprite].yvel = 0;
sprite[nSprite].ang = GetMyAngle(sprite[nTarget].x - sprite[nSprite].x, sprite[nTarget].y - sprite[nSprite].y); sprite[nSprite].ang = GetMyAngle(sprite[nTarget].x - sprite[nSprite].x, sprite[nTarget].y - sprite[nSprite].y);
RoachList[nRoach].field_2 = 0; RoachList[nRoach].nFrame = 0;
} }
else else
{ {
@ -337,29 +348,29 @@ void FuncRoach(int a, int nDamage, int nRun)
} }
else else
{ {
if (RoachList[nRoach].field_C != 0) if (RoachList[nRoach].nCount != 0)
{ {
RoachList[nRoach].field_C--; RoachList[nRoach].nCount--;
} }
else else
{ {
// same as above // same as above
RoachList[nRoach].field_E = RandomSize(2) + 1; RoachList[nRoach].nIndex = RandomSize(2) + 1;
RoachList[nRoach].nAction = 3; RoachList[nRoach].nAction = 3;
sprite[nSprite].xvel = 0; sprite[nSprite].xvel = 0;
sprite[nSprite].yvel = 0; sprite[nSprite].yvel = 0;
sprite[nSprite].ang = GetMyAngle(sprite[nTarget].x - sprite[nSprite].x, sprite[nTarget].y - sprite[nSprite].y); sprite[nSprite].ang = GetMyAngle(sprite[nTarget].x - sprite[nSprite].x, sprite[nTarget].y - sprite[nSprite].y);
RoachList[nRoach].field_2 = 0; RoachList[nRoach].nFrame = 0;
} }
} }
if (nTarget != -1 && !(sprite[nTarget].cstat & 0x101)) if (nTarget != -1 && !(sprite[nTarget].cstat & 0x101))
{ {
RoachList[nRoach].nAction = 1; RoachList[nRoach].nAction = 1;
RoachList[nRoach].field_2 = 0; RoachList[nRoach].nFrame = 0;
RoachList[nRoach].field_C = 100; RoachList[nRoach].nCount = 100;
RoachList[nRoach].nTarget = -1; RoachList[nRoach].nTarget = -1;
sprite[nSprite].xvel = 0; sprite[nSprite].xvel = 0;
sprite[nSprite].yvel = 0; sprite[nSprite].yvel = 0;
@ -372,13 +383,13 @@ void FuncRoach(int a, int nDamage, int nRun)
{ {
if (bVal) if (bVal)
{ {
RoachList[nRoach].field_E--; RoachList[nRoach].nIndex--;
if (RoachList[nRoach].field_E <= 0) if (RoachList[nRoach].nIndex <= 0)
{ {
RoachList[nRoach].nAction = 2; RoachList[nRoach].nAction = 2;
GoRoach(nSprite); GoRoach(nSprite);
RoachList[nRoach].field_2 = 0; RoachList[nRoach].nFrame = 0;
RoachList[nRoach].field_C = RandomSize(7); RoachList[nRoach].nCount = RandomSize(7);
} }
} }
else else
@ -397,7 +408,7 @@ void FuncRoach(int a, int nDamage, int nRun)
if (bVal) if (bVal)
{ {
RoachList[nRoach].nAction = 2; RoachList[nRoach].nAction = 2;
RoachList[nRoach].field_2 = 0; RoachList[nRoach].nFrame = 0;
} }
return; return;
@ -409,7 +420,7 @@ void FuncRoach(int a, int nDamage, int nRun)
{ {
sprite[nSprite].cstat = 0; sprite[nSprite].cstat = 0;
RoachList[nRoach].nAction = 6; RoachList[nRoach].nAction = 6;
RoachList[nRoach].field_2 = 0; RoachList[nRoach].nFrame = 0;
} }
return; return;

2
source/exhumed/src/save.cpp
View file

@ -36,6 +36,7 @@ void SerializeLion(FSerializer& arc);
void SerializeMummy(FSerializer& arc); void SerializeMummy(FSerializer& arc);
void SerializeRat(FSerializer& arc); void SerializeRat(FSerializer& arc);
void SerializeRex(FSerializer& arc); void SerializeRex(FSerializer& arc);
void SerializeRoach(FSerializer& arc);
void SerializeSpider(FSerializer& arc); void SerializeSpider(FSerializer& arc);
@ -60,6 +61,7 @@ void GameInterface::SerializeGameState(FSerializer& arc)
SerializeMummy(arc); SerializeMummy(arc);
SerializeRat(arc); SerializeRat(arc);
SerializeRex(arc); SerializeRex(arc);
SerializeRoach(arc);
SerializeSpider(arc); SerializeSpider(arc);
} }