zdoom/raze-gles
0
0
Fork 0
mirror of https://github.com/ZDoom/raze-gles.git synced 2025-02-05 05:10:55 +00:00
Code Issues Projects Releases Packages Wiki Activity

- Exhumed: Wasp

Browse source
This commit is contained in:
Christoph Oelckers 2020-11-29 21:09:41 +01:00
parent 45ee475df7
commit 9a345bdfa7
4 changed files with 60 additions and 51 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -513,7 +513,7 @@ int BuildSwPressWall(short nChannel, short nLink, short nWall);
// wasp // wasp
extern short nWaspCount; int WaspCount();
void InitWasps(); void InitWasps();
int BuildWasp(short nSprite, int x, int y, int z, short nSector, short nAngle); int BuildWasp(short nSprite, int x, int y, int z, short nSector, short nAngle);

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

@ -1284,7 +1284,7 @@ void FuncQueen(int a, int nDamage, int nRun)
{ {
if (QueenList[nQueen].field_C <= 0) if (QueenList[nQueen].field_C <= 0)
{ {
if (nWaspCount < 100) if (WaspCount() < 100)
{ {
QueenList[nQueen].nAction = 6; QueenList[nQueen].nAction = 6;
QueenList[nQueen].nFrame = 0; QueenList[nQueen].nFrame = 0;

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

@ -40,7 +40,7 @@ void SerializeRoach(FSerializer& arc);
void SerializeScorpion(FSerializer& arc); void SerializeScorpion(FSerializer& arc);
void SerializeSet(FSerializer& arc); void SerializeSet(FSerializer& arc);
void SerializeSpider(FSerializer& arc); void SerializeSpider(FSerializer& arc);
void SerializeWasp(FSerializer& arc);
void SaveTextureState(); void SaveTextureState();
void LoadTextureState(); void LoadTextureState();
@ -67,9 +67,9 @@ void GameInterface::SerializeGameState(FSerializer& arc)
SerializeScorpion(arc); SerializeScorpion(arc);
SerializeSet(arc); SerializeSet(arc);
SerializeSpider(arc); SerializeSpider(arc);
SerializeWasp(arc);
} }
bool GameInterface::LoadGame() bool GameInterface::LoadGame()
{ {

103
source/exhumed/src/wasp.cpp
View file

@ -24,11 +24,6 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
BEGIN_PS_NS BEGIN_PS_NS
enum { kMaxWasps = 100 };
static short nWaspVelShift = 0;
short nWaspCount;
struct Wasp struct Wasp
{ {
short nHealth; short nHealth;
@ -37,15 +32,14 @@ struct Wasp
short nSprite; short nSprite;
short nRun; short nRun;
short nTarget; short nTarget;
short field_C; short nCount;
short field_E; short nAngle;
short field_10; short nAngle2;
short field_12; short nVel;
short field_14;
short nDamage; short nDamage;
}; };
Wasp WaspList[kMaxWasps]; TArray<Wasp> WaspList;
static actionSeq WaspSeq[] = { static actionSeq WaspSeq[] = {
{0, 0}, {0, 0},
@ -57,32 +51,50 @@ static actionSeq WaspSeq[] = {
{29, 1} {29, 1}
}; };
static SavegameHelper sghwasp("wasp", FSerializer& Serialize(FSerializer& arc, const char* keyname, Wasp& w, Wasp* def)
SV(nWaspVelShift), {
SV(nWaspCount), if (arc.BeginObject(keyname))
SA(WaspList), {
nullptr); arc("health", w.nHealth)
("frame", w.nFrame)
("action", w.nAction)
("sprite", w.nSprite)
("target", w.nTarget)
("run", w.nRun)
("count", w.nCount)
("angle", w.nAngle)
("angle2", w.nAngle2)
("vel", w.nVel)
("damage", w.nDamage)
.EndObject();
}
return arc;
}
void SerializeWasp(FSerializer& arc)
{
arc("wasp", WaspList);
}
int WaspCount()
{
return WaspList.Size();
}
void InitWasps() void InitWasps()
{ {
nWaspCount = 0; WaspList.Clear();
} }
void SetWaspVel(short nSprite) void SetWaspVel(short nSprite)
{ {
sprite[nSprite].xvel = bcos(sprite[nSprite].ang, -nWaspVelShift); sprite[nSprite].xvel = bcos(sprite[nSprite].ang);
sprite[nSprite].yvel = bsin(sprite[nSprite].ang, -nWaspVelShift); sprite[nSprite].yvel = bsin(sprite[nSprite].ang);
} }
int BuildWasp(short nSprite, int x, int y, int z, short nSector, short nAngle) int BuildWasp(short nSprite, int x, int y, int z, short nSector, short nAngle)
{ {
if (nWaspCount >= kMaxWasps) { auto nWasp = WaspList.Reserve(1);
return -1;
}
short nWasp = nWaspCount;
nWaspCount++;
uint8_t bEggWasp = false; uint8_t bEggWasp = false;
if (nSprite == -2) { if (nSprite == -2) {
@ -142,18 +154,17 @@ int BuildWasp(short nSprite, int x, int y, int z, short nSector, short nAngle)
if (bEggWasp) if (bEggWasp)
{ {
WaspList[nWasp].field_C = 60; WaspList[nWasp].nCount = 60;
WaspList[nWasp].nDamage /= 2; WaspList[nWasp].nDamage /= 2;
} }
else else
{ {
WaspList[nWasp].field_C = RandomSize(5); WaspList[nWasp].nCount = RandomSize(5);
} }
WaspList[nWasp].field_E = 0; WaspList[nWasp].nAngle = 0;
WaspList[nWasp].field_14 = 0; WaspList[nWasp].nVel = 0;
WaspList[nWasp].field_12 = 0; WaspList[nWasp].nAngle2 = RandomSize(7) + 127;
WaspList[nWasp].field_10 = RandomSize(7) + 127;
sprite[nSprite].owner = runlist_AddRunRec(sprite[nSprite].lotag - 1, nWasp | 0x1E0000); sprite[nSprite].owner = runlist_AddRunRec(sprite[nSprite].lotag - 1, nWasp | 0x1E0000);
@ -215,15 +226,13 @@ void FuncWasp(int a, int nDamage, int nRun)
sprite[nSprite].ang += RandomSize(9) + 768; sprite[nSprite].ang += RandomSize(9) + 768;
sprite[nSprite].ang &= kAngleMask; sprite[nSprite].ang &= kAngleMask;
WaspList[nWasp].field_12 = 3000; WaspList[nWasp].nVel = 3000;
sprite[nSprite].zvel = (-20) - RandomSize(6); sprite[nSprite].zvel = (-20) - RandomSize(6);
} }
else else
{ {
// Wasp is dead // Wasp is dead
nWaspVelShift = 0;
WaspList[nWasp].nAction = 4; WaspList[nWasp].nAction = 4;
WaspList[nWasp].nFrame = 0; WaspList[nWasp].nFrame = 0;
@ -264,7 +273,7 @@ void FuncWasp(int a, int nDamage, int nRun)
// goto pink // goto pink
WaspList[nWasp].nTarget = -1; WaspList[nWasp].nTarget = -1;
WaspList[nWasp].nAction = 0; WaspList[nWasp].nAction = 0;
WaspList[nWasp].field_C = RandomSize(6); WaspList[nWasp].nCount = RandomSize(6);
return; return;
} }
} }
@ -276,17 +285,17 @@ void FuncWasp(int a, int nDamage, int nRun)
case 0: case 0:
{ {
sprite[nSprite].zvel = bsin(WaspList[nWasp].field_E, -4); sprite[nSprite].zvel = bsin(WaspList[nWasp].nAngle, -4);
WaspList[nWasp].field_E += WaspList[nWasp].field_10; WaspList[nWasp].nAngle += WaspList[nWasp].nAngle2;
WaspList[nWasp].field_E &= kAngleMask; WaspList[nWasp].nAngle &= kAngleMask;
MoveCreature(nSprite); MoveCreature(nSprite);
if (nTarget >= 0) if (nTarget >= 0)
{ {
WaspList[nWasp].field_C--; WaspList[nWasp].nCount--;
if (WaspList[nWasp].field_C > 0) if (WaspList[nWasp].nCount > 0)
{ {
PlotCourseToSprite(nSprite, nTarget); PlotCourseToSprite(nSprite, nTarget);
} }
@ -295,8 +304,8 @@ void FuncWasp(int a, int nDamage, int nRun)
sprite[nSprite].zvel = 0; sprite[nSprite].zvel = 0;
WaspList[nWasp].nAction = 1; WaspList[nWasp].nAction = 1;
WaspList[nWasp].nFrame = 0; WaspList[nWasp].nFrame = 0;
WaspList[nWasp].field_12 = 1500; WaspList[nWasp].nVel = 1500;
WaspList[nWasp].field_C = RandomSize(5) + 60; WaspList[nWasp].nCount = RandomSize(5) + 60;
} }
} }
else else
@ -311,16 +320,16 @@ void FuncWasp(int a, int nDamage, int nRun)
case 1: case 1:
{ {
WaspList[nWasp].field_C--; WaspList[nWasp].nCount--;
if (WaspList[nWasp].field_C <= 0) if (WaspList[nWasp].nCount <= 0)
{ {
WaspList[nWasp].nAction = 0; WaspList[nWasp].nAction = 0;
WaspList[nWasp].field_C = RandomSize(6); WaspList[nWasp].nCount = RandomSize(6);
return; return;
} }
int nChaseVal = AngleChase(nSprite, nTarget, WaspList[nWasp].field_12, 0, 16); int nChaseVal = AngleChase(nSprite, nTarget, WaspList[nWasp].nVel, 0, 16);
switch (nChaseVal & 0xC000) switch (nChaseVal & 0xC000)
{ {
@ -360,7 +369,7 @@ void FuncWasp(int a, int nDamage, int nRun)
sprite[nSprite].zvel = (-20) - RandomSize(6); sprite[nSprite].zvel = (-20) - RandomSize(6);
WaspList[nWasp].nAction = 1; WaspList[nWasp].nAction = 1;
WaspList[nWasp].field_12 = 3000; WaspList[nWasp].nVel = 3000;
} }
return; return;
} }