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

- Exhumed: ... and for the lava dude.

Browse source
This commit is contained in:
Christoph Oelckers 2020-11-29 20:30:17 +01:00
parent bd3efcb6c4
commit 1fa087767e
1 changed files with 28 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

49
source/exhumed/src/lavadude.cpp
View file

@ -25,8 +25,6 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
BEGIN_PS_NS BEGIN_PS_NS
enum { kMaxLavas = 20 };
struct Lava struct Lava
{ {
short nSprite; short nSprite;
@ -35,12 +33,32 @@ struct Lava
short nTarget; short nTarget;
short nHealth; short nHealth;
short nFrame; short nFrame;
short nChannel; short nIndex;
}; };
Lava LavaList[kMaxLavas]; TArray<Lava> LavaList;
FSerializer& Serialize(FSerializer& arc, const char* keyname, Lava& w, Lava* def)
{
if (arc.BeginObject(keyname))
{
arc("health", w.nHealth)
("frame", w.nFrame)
("action", w.nAction)
("sprite", w.nSprite)
("target", w.nTarget)
("run", w.nRun)
("channel", w.nIndex)
.EndObject();
}
return arc;
}
void SerializeLavadude(FSerializer& arc)
{
arc("lavadude", LavaList);
}
short LavaCount = 0;
static actionSeq LavadudeSeq[] = { static actionSeq LavadudeSeq[] = {
{0, 1}, {0, 1},
@ -54,15 +72,9 @@ static actionSeq LavadudeSeq[] = {
{42, 1} {42, 1}
}; };
static SavegameHelper sghlava("lavadude",
SA(LavaList),
SV(LavaCount),
nullptr);
void InitLava() void InitLava()
{ {
LavaCount = 0; LavaList.Clear();
} }
int BuildLavaLimb(int nSprite, int edx, int ebx) int BuildLavaLimb(int nSprite, int edx, int ebx)
@ -142,12 +154,7 @@ void FuncLavaLimb(int a, int, int nRun)
int BuildLava(short nSprite, int x, int y, int, short nSector, short nAngle, int nChannel) int BuildLava(short nSprite, int x, int y, int, short nSector, short nAngle, int nChannel)
{ {
short nLava = LavaCount; auto nLava = LavaList.Reserve(1);
LavaCount++;
if (nLava >= kMaxLavas) {
return -1;
}
if (nSprite == -1) if (nSprite == -1)
{ {
@ -192,7 +199,7 @@ int BuildLava(short nSprite, int x, int y, int, short nSector, short nAngle, int
LavaList[nLava].nHealth = 4000; LavaList[nLava].nHealth = 4000;
LavaList[nLava].nSprite = nSprite; LavaList[nLava].nSprite = nSprite;
LavaList[nLava].nTarget = -1; LavaList[nLava].nTarget = -1;
LavaList[nLava].nChannel = nChannel; LavaList[nLava].nIndex = nChannel;
LavaList[nLava].nFrame = 0; LavaList[nLava].nFrame = 0;
sprite[nSprite].owner = runlist_AddRunRec(sprite[nSprite].lotag - 1, nLava | 0x150000); sprite[nSprite].owner = runlist_AddRunRec(sprite[nSprite].lotag - 1, nLava | 0x150000);
@ -206,7 +213,7 @@ int BuildLava(short nSprite, int x, int y, int, short nSector, short nAngle, int
void FuncLava(int a, int nDamage, int nRun) void FuncLava(int a, int nDamage, int nRun)
{ {
short nLava = RunData[nRun].nVal; short nLava = RunData[nRun].nVal;
assert(nLava >= 0 && nLava < kMaxLavas); assert(nLava >= 0 && nLava < LavaList.Size());
short nAction = LavaList[nLava].nAction; short nAction = LavaList[nLava].nAction;
short nSeq = LavadudeSeq[nAction].a + SeqOffsets[kSeqLavag]; short nSeq = LavadudeSeq[nAction].a + SeqOffsets[kSeqLavag];
@ -461,7 +468,7 @@ void FuncLava(int a, int nDamage, int nRun)
ecx++; ecx++;
} }
while (ecx < 20); while (ecx < 20);
runlist_ChangeChannel(LavaList[nLava].nChannel, 1); runlist_ChangeChannel(LavaList[nLava].nIndex, 1);
} }
} }
else else