zdoom/raze-gles
0
0
Fork 0
mirror of https://github.com/ZDoom/raze-gles.git synced 2025-01-12 19:20:38 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fix the Roach/Kilmaat sentry being unkillable. I was missing the line in BuildRoach() to set it's sprite's cstat value

Browse source
This commit is contained in:
sirlemonhead 2019-11-15 20:42:46 +00:00 committed by Christoph Oelckers
parent fe24913d63
commit 87ef1331d9
2 changed files with 43 additions and 43 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -23,7 +23,7 @@ struct Roach
{ {
short nHealth; short nHealth;
short field_2; short field_2;
short nType; short nAction;
short nSprite; short nSprite;
short nTarget; short nTarget;
short field_A; short field_A;
@ -42,8 +42,8 @@ void InitRoachs()
RoachSprite = 1; RoachSprite = 1;
} }
// TODO - make EAX a bool type? // TODO - make nType a bool?
int BuildRoach(int eax, 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--; RoachCount--;
if (RoachCount < 0) { if (RoachCount < 0) {
@ -68,6 +68,7 @@ int BuildRoach(int eax, int nSprite, int x, int y, int z, short nSector, int ang
sprite[nSprite].x = x; sprite[nSprite].x = x;
sprite[nSprite].y = y; sprite[nSprite].y = y;
sprite[nSprite].z = z; sprite[nSprite].z = z;
sprite[nSprite].cstat = 0x101;
sprite[nSprite].shade = -12; sprite[nSprite].shade = -12;
sprite[nSprite].xoffset = 0; sprite[nSprite].xoffset = 0;
sprite[nSprite].yoffset = 0; sprite[nSprite].yoffset = 0;
@ -86,13 +87,13 @@ int BuildRoach(int eax, int nSprite, int x, int y, int z, short nSector, int ang
// GrabTimeSlot(3); // GrabTimeSlot(3);
if (eax) if (nType)
{ {
RoachList[RoachCount].nType = 0; RoachList[RoachCount].nAction = 0;
} }
else else
{ {
RoachList[RoachCount].nType = 1; RoachList[RoachCount].nAction = 1;
} }
RoachList[RoachCount].nSprite = nSprite; RoachList[RoachCount].nSprite = nSprite;
@ -122,7 +123,7 @@ void FuncRoach(int a, int nDamage, int nRun)
bool bVar_24 = false; bool bVar_24 = false;
short nSprite = RoachList[nRoach].nSprite; short nSprite = RoachList[nRoach].nSprite;
short nType = RoachList[nRoach].nType; short nAction = RoachList[nRoach].nAction;
int nMessage = a & 0x7F0000; int nMessage = a & 0x7F0000;
@ -136,7 +137,7 @@ void FuncRoach(int a, int nDamage, int nRun)
case 0x90000: case 0x90000:
{ {
seq_PlotSequence(a & 0xFFFF, ActionSeq[nType].a + SeqOffsets[kSeqRoach], RoachList[nRoach].field_2, ActionSeq[nType].b); seq_PlotSequence(a & 0xFFFF, ActionSeq[nAction].a + SeqOffsets[kSeqRoach], RoachList[nRoach].field_2, ActionSeq[nAction].b);
return; return;
} }
@ -155,34 +156,32 @@ void FuncRoach(int a, int nDamage, int nRun)
RoachList[nRoach].nHealth -= nDamage; RoachList[nRoach].nHealth -= nDamage;
if (RoachList[nRoach].nHealth <= 0) if (RoachList[nRoach].nHealth <= 0)
{ {
sprite[nSprite].zvel = 0;
sprite[nSprite].yvel = 0;
sprite[nSprite].xvel = 0; sprite[nSprite].xvel = 0;
sprite[nSprite].yvel = 0;
sprite[nSprite].zvel = 0;
RoachList[nRoach].nHealth = 0; RoachList[nRoach].nHealth = 0;
sprite[nSprite].cstat &= 0x0FEFE; sprite[nSprite].cstat &= 0xFEFE;
nCreaturesLeft++; nCreaturesLeft++; // This seems to be incorrect in original exe? should be decrementing?
if (nType < 5) if (nAction < 5)
{ {
DropMagic(nSprite); DropMagic(nSprite);
RoachList[nRoach].nType = 5; RoachList[nRoach].nAction = 5;
RoachList[nRoach].field_2 = 0; RoachList[nRoach].field_2 = 0;
} }
} }
else else
{ {
short nSprite2 = a & 0xFFFF; short nSprite2 = a & 0xFFFF;
if (nSprite2 < 0) { if (nSprite2 >= 0)
return; {
}
if (sprite[nSprite2].statnum < 199) { if (sprite[nSprite2].statnum < 199) {
RoachList[nRoach].nTarget = nSprite2; RoachList[nRoach].nTarget = nSprite2;
} }
if (nType == 0) if (nAction == 0)
{ {
RoachList[nRoach].nType = 2; RoachList[nRoach].nAction = 2;
GoRoach(nSprite); GoRoach(nSprite);
RoachList[nRoach].field_2 = 0; RoachList[nRoach].field_2 = 0;
} }
@ -190,12 +189,13 @@ void FuncRoach(int a, int nDamage, int nRun)
{ {
if (!RandomSize(4)) if (!RandomSize(4))
{ {
RoachList[nRoach].nType = 4; RoachList[nRoach].nAction = 4;
RoachList[nRoach].field_2 = 0; RoachList[nRoach].field_2 = 0;
} }
} }
} }
} }
}
return; return;
} }
@ -204,7 +204,7 @@ void FuncRoach(int a, int nDamage, int nRun)
{ {
Gravity(nSprite); Gravity(nSprite);
int nSeq = SeqOffsets[kSeqRoach] + ActionSeq[RoachList[nRoach].nType].a; int nSeq = SeqOffsets[kSeqRoach] + ActionSeq[RoachList[nRoach].nAction].a;
sprite[nSprite].picnum = seq_GetSeqPicnum2(nSeq, RoachList[nRoach].field_2); sprite[nSprite].picnum = seq_GetSeqPicnum2(nSeq, RoachList[nRoach].field_2);
seq_MoveSequence(nSprite, nSeq, RoachList[nRoach].field_2); seq_MoveSequence(nSprite, nSeq, RoachList[nRoach].field_2);
@ -219,11 +219,11 @@ void FuncRoach(int a, int nDamage, int nRun)
int nFlag = FrameFlag[SeqBase[nSeq] + RoachList[nRoach].field_2]; int nFlag = FrameFlag[SeqBase[nSeq] + RoachList[nRoach].field_2];
short nTarget = RoachList[nRoach].nTarget; short nTarget = RoachList[nRoach].nTarget;
if (nType > 5) { if (nAction > 5) {
return; return;
} }
switch (nType) switch (nAction)
{ {
case 0: case 0:
{ {
@ -245,7 +245,7 @@ void FuncRoach(int a, int nDamage, int nRun)
short nTarget = FindPlayer(nSprite, 50); short nTarget = FindPlayer(nSprite, 50);
if (nTarget >= 0) if (nTarget >= 0)
{ {
RoachList[nRoach].nType = 2; RoachList[nRoach].nAction = 2;
RoachList[nRoach].field_2 = 0; RoachList[nRoach].field_2 = 0;
RoachList[nRoach].nTarget = nTarget; RoachList[nRoach].nTarget = nTarget;
GoRoach(nSprite); GoRoach(nSprite);
@ -263,7 +263,7 @@ void FuncRoach(int a, int nDamage, int nRun)
short nTarget = FindPlayer(nSprite, 100); short nTarget = FindPlayer(nSprite, 100);
if (nTarget >= 0) if (nTarget >= 0)
{ {
RoachList[nRoach].nType = 2; RoachList[nRoach].nAction = 2;
RoachList[nRoach].field_2 = 0; RoachList[nRoach].field_2 = 0;
RoachList[nRoach].nTarget = nTarget; RoachList[nRoach].nTarget = nTarget;
GoRoach(nSprite); GoRoach(nSprite);
@ -289,7 +289,7 @@ void FuncRoach(int a, int nDamage, int nRun)
{ {
// repeated below // repeated below
RoachList[nRoach].field_E = RandomSize(2) + 1; RoachList[nRoach].field_E = RandomSize(2) + 1;
RoachList[nRoach].nType = 3; RoachList[nRoach].nAction = 3;
sprite[nSprite].xvel = 0; sprite[nSprite].xvel = 0;
sprite[nSprite].yvel = 0; sprite[nSprite].yvel = 0;
@ -319,7 +319,7 @@ void FuncRoach(int a, int nDamage, int nRun)
{ {
// same as above // same as above
RoachList[nRoach].field_E = RandomSize(2) + 1; RoachList[nRoach].field_E = RandomSize(2) + 1;
RoachList[nRoach].nType = 3; RoachList[nRoach].nAction = 3;
sprite[nSprite].xvel = 0; sprite[nSprite].xvel = 0;
sprite[nSprite].yvel = 0; sprite[nSprite].yvel = 0;
@ -331,7 +331,7 @@ void FuncRoach(int a, int nDamage, int nRun)
if (nTarget != -1 && !(sprite[nTarget].cstat & 0x101)) if (nTarget != -1 && !(sprite[nTarget].cstat & 0x101))
{ {
RoachList[nRoach].nType = 1; RoachList[nRoach].nAction = 1;
RoachList[nRoach].field_2 = 0; RoachList[nRoach].field_2 = 0;
RoachList[nRoach].field_C = 100; RoachList[nRoach].field_C = 100;
RoachList[nRoach].nTarget = -1; RoachList[nRoach].nTarget = -1;
@ -349,7 +349,7 @@ void FuncRoach(int a, int nDamage, int nRun)
RoachList[nRoach].field_E--; RoachList[nRoach].field_E--;
if (RoachList[nRoach].field_E <= 0) if (RoachList[nRoach].field_E <= 0)
{ {
RoachList[nRoach].nType = 2; RoachList[nRoach].nAction = 2;
GoRoach(nSprite); GoRoach(nSprite);
RoachList[nRoach].field_2 = 0; RoachList[nRoach].field_2 = 0;
RoachList[nRoach].field_C = RandomSize(7); RoachList[nRoach].field_C = RandomSize(7);
@ -370,7 +370,7 @@ void FuncRoach(int a, int nDamage, int nRun)
{ {
if (bVar_24) if (bVar_24)
{ {
RoachList[nRoach].nType = 2; RoachList[nRoach].nAction = 2;
RoachList[nRoach].field_2 = 0; RoachList[nRoach].field_2 = 0;
} }
@ -382,7 +382,7 @@ void FuncRoach(int a, int nDamage, int nRun)
if (bVar_24) if (bVar_24)
{ {
sprite[nSprite].cstat = 0; sprite[nSprite].cstat = 0;
RoachList[nRoach].nType = 6; RoachList[nRoach].nAction = 6;
RoachList[nRoach].field_2 = 0; RoachList[nRoach].field_2 = 0;
} }

2
source/exhumed/src/roach.h
View file

@ -3,7 +3,7 @@
#define __roach_h__ #define __roach_h__
void InitRoachs(); void InitRoachs();
int BuildRoach(int eax, 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);
void FuncRoach(int a, int nDamage, int nRun); void FuncRoach(int a, int nDamage, int nRun);
#endif #endif