zdoom/raze-gles
0
0
Fork 0
mirror of https://github.com/ZDoom/raze-gles.git synced 2024-12-28 12:30:46 +00:00
Code Issues Projects Releases Packages Wiki Activity

- Exhumed: Anubis cleanup, JSON serialization and limit removal.

Browse source
This commit is contained in:
Christoph Oelckers 2020-11-29 19:15:59 +01:00
parent 8a7b3dc667
commit b26f6157e9
3 changed files with 149 additions and 127 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

266
source/exhumed/src/anubis.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 { kMaxAnubis = 80 };
struct Anubis struct Anubis
{ {
short nHealth; short nHealth;
@ -39,9 +37,8 @@ struct Anubis
short h; short h;
}; };
Anubis AnubisList[kMaxAnubis]; static TArray<Anubis> AnubisList;
static int nAnubisDrum = 0;
short AnubisCount = -1;
static actionSeq AnubisSeq[] = { static actionSeq AnubisSeq[] = {
{ 0, 0 }, { 0, 0 },
@ -61,71 +58,84 @@ static actionSeq AnubisSeq[] = {
{ 43, 1 }, { 43, 1 },
}; };
short nAnubisDrum = 0; FSerializer& Serialize(FSerializer& arc, const char* keyname, Anubis& w, Anubis* def)
{
static SavegameHelper sghanubis("anubis", if (arc.BeginObject(keyname))
SA(AnubisList), {
SV(AnubisCount), arc("health", w.nHealth)
SV(nAnubisDrum), ("frame", w.nFrame)
nullptr); ("action", w.nAction)
("sprite", w.nSprite)
("target", w.nTarget)
("f", w.f)
("g", w.g)
("h", w.h)
.EndObject();
}
return arc;
}
void SerializeAnubis(FSerializer& arc)
{
arc("anubis", AnubisList)
("anubisdrum", nAnubisDrum);
}
void InitAnubis() void InitAnubis()
{ {
AnubisCount = kMaxAnubis; AnubisList.Clear();
nAnubisDrum = 1; nAnubisDrum = 1;
} }
int BuildAnubis(int nSprite, int x, int y, int z, int nSector, int nAngle, uint8_t bIsDrummer) int BuildAnubis(int nSprite, int x, int y, int z, int nSector, int nAngle, uint8_t bIsDrummer)
{ {
AnubisCount--; auto nAnubis = AnubisList.Reserve(1);
short nAnubis = AnubisCount; auto ap = &AnubisList[nAnubis];
if (nAnubis < 0) {
return -1;
}
spritetype* sp;
if (nSprite == -1) if (nSprite == -1)
{ {
nSprite = insertsprite(nSector, 101); nSprite = insertsprite(nSector, 101);
sp = &sprite[nSprite];
} }
else else
{ {
changespritestat(nSprite, 101); changespritestat(nSprite, 101);
sp = &sprite[nSprite];
x = sprite[nSprite].x; x = sp->x;
y = sprite[nSprite].y; y = sp->y;
z = sector[sprite[nSprite].sectnum].floorz; z = sector[sp->sectnum].floorz;
nAngle = sprite[nSprite].ang; nAngle = sp->ang;
} }
assert(nSprite >=0 && nSprite < kMaxSprites); assert(nSprite >=0 && nSprite < kMaxSprites);
sprite[nSprite].x = x; sp->x = x;
sprite[nSprite].y = y; sp->y = y;
sprite[nSprite].z = z; sp->z = z;
sprite[nSprite].cstat = 0x101; sp->cstat = 0x101;
sprite[nSprite].xoffset = 0; sp->xoffset = 0;
sprite[nSprite].shade = -12; sp->shade = -12;
sprite[nSprite].yoffset = 0; sp->yoffset = 0;
sprite[nSprite].picnum = 1; sp->picnum = 1;
sprite[nSprite].pal = sector[sprite[nSprite].sectnum].ceilingpal; sp->pal = sector[sp->sectnum].ceilingpal;
sprite[nSprite].clipdist = 60; sp->clipdist = 60;
sprite[nSprite].ang = nAngle; sp->ang = nAngle;
sprite[nSprite].xrepeat = 40; sp->xrepeat = 40;
sprite[nSprite].yrepeat = 40; sp->yrepeat = 40;
sprite[nSprite].xvel = 0; sp->xvel = 0;
sprite[nSprite].yvel = 0; sp->yvel = 0;
sprite[nSprite].zvel = 0; sp->zvel = 0;
sprite[nSprite].hitag = 0; sp->hitag = 0;
sprite[nSprite].lotag = runlist_HeadRun() + 1; sp->lotag = runlist_HeadRun() + 1;
sprite[nSprite].extra = -1; sp->extra = -1;
// GrabTimeSlot(3); // GrabTimeSlot(3);
if (bIsDrummer) if (bIsDrummer)
{ {
AnubisList[nAnubis].nAction = nAnubisDrum + 6; ap->nAction = nAnubisDrum + 6;
nAnubisDrum++; nAnubisDrum++;
if (nAnubisDrum >= 5) { if (nAnubisDrum >= 5) {
@ -134,16 +144,16 @@ int BuildAnubis(int nSprite, int x, int y, int z, int nSector, int nAngle, uint8
} }
else else
{ {
AnubisList[nAnubis].nAction = 0; ap->nAction = 0;
} }
AnubisList[nAnubis].nHealth = 540; ap->nHealth = 540;
AnubisList[nAnubis].nFrame = 0; ap->nFrame = 0;
AnubisList[nAnubis].nSprite = nSprite; ap->nSprite = nSprite;
AnubisList[nAnubis].nTarget = -1; ap->nTarget = -1;
AnubisList[nAnubis].g = 0; ap->g = 0;
sprite[nSprite].owner = runlist_AddRunRec(sprite[nSprite].lotag - 1, nAnubis | 0x90000); sp->owner = runlist_AddRunRec(sp->lotag - 1, nAnubis | 0x90000);
runlist_AddRunRec(NewRun, nAnubis | 0x90000); runlist_AddRunRec(NewRun, nAnubis | 0x90000);
nCreaturesTotal++; nCreaturesTotal++;
@ -154,10 +164,12 @@ int BuildAnubis(int nSprite, int x, int y, int z, int nSector, int nAngle, uint8
void FuncAnubis(int a, int nDamage, int nRun) void FuncAnubis(int a, int nDamage, int nRun)
{ {
short nAnubis = RunData[nRun].nVal; short nAnubis = RunData[nRun].nVal;
assert(nAnubis >= 0 && nAnubis < kMaxAnubis); auto ap = &AnubisList[nAnubis];
assert(nAnubis >= 0 && nAnubis < (int)AnubisList.Size());
short nSprite = AnubisList[nAnubis].nSprite; short nSprite = ap->nSprite;
short nAction = AnubisList[nAnubis].nAction; auto sp = &sprite[nSprite];
short nAction = ap->nAction;
bool bVal = false; bool bVal = false;
@ -179,20 +191,20 @@ void FuncAnubis(int a, int nDamage, int nRun)
short nSeq = SeqOffsets[kSeqAnubis] + AnubisSeq[nAction].a; short nSeq = SeqOffsets[kSeqAnubis] + AnubisSeq[nAction].a;
seq_MoveSequence(nSprite, nSeq, AnubisList[nAnubis].nFrame); seq_MoveSequence(nSprite, nSeq, ap->nFrame);
sprite[nSprite].picnum = seq_GetSeqPicnum2(nSeq, AnubisList[nAnubis].nFrame); sp->picnum = seq_GetSeqPicnum2(nSeq, ap->nFrame);
AnubisList[nAnubis].nFrame++; ap->nFrame++;
if (AnubisList[nAnubis].nFrame >= SeqSize[nSeq]) if (ap->nFrame >= SeqSize[nSeq])
{ {
AnubisList[nAnubis].nFrame = 0; ap->nFrame = 0;
bVal = true; bVal = true;
} }
short nTarget = AnubisList[nAnubis].nTarget; short nTarget = ap->nTarget;
short nFrame = SeqBase[nSeq] + AnubisList[nAnubis].nFrame; short nFrame = SeqBase[nSeq] + ap->nFrame;
short nFlag = FrameFlag[nFrame]; short nFlag = FrameFlag[nFrame];
int nMov = 0; int nMov = 0;
@ -214,12 +226,12 @@ void FuncAnubis(int a, int nDamage, int nRun)
if (nTarget >= 0) if (nTarget >= 0)
{ {
D3PlayFX(StaticSound[kSound8], nSprite); D3PlayFX(StaticSound[kSound8], nSprite);
AnubisList[nAnubis].nAction = 1; ap->nAction = 1;
AnubisList[nAnubis].nFrame = 0; ap->nFrame = 0;
AnubisList[nAnubis].nTarget = nTarget; ap->nTarget = nTarget;
sprite[nSprite].xvel = bcos(sprite[nSprite].ang, -2); sp->xvel = bcos(sp->ang, -2);
sprite[nSprite].yvel = bsin(sprite[nSprite].ang, -2); sp->yvel = bsin(sp->ang, -2);
} }
} }
return; return;
@ -230,9 +242,9 @@ void FuncAnubis(int a, int nDamage, int nRun)
{ {
PlotCourseToSprite(nSprite, nTarget); PlotCourseToSprite(nSprite, nTarget);
int nAngle = sprite[nSprite].ang & 0xFFF8; int nAngle = sp->ang & 0xFFF8;
sprite[nSprite].xvel = bcos(nAngle, -2); sp->xvel = bcos(nAngle, -2);
sprite[nSprite].yvel = bsin(nAngle, -2); sp->yvel = bsin(nAngle, -2);
} }
switch (nMov & 0xC000) switch (nMov & 0xC000)
@ -241,13 +253,13 @@ void FuncAnubis(int a, int nDamage, int nRun)
{ {
if ((nMov & 0x3FFF) == nTarget) if ((nMov & 0x3FFF) == nTarget)
{ {
int nAng = getangle(sprite[nTarget].x - sprite[nSprite].x, sprite[nTarget].y - sprite[nSprite].y); int nAng = getangle(sprite[nTarget].x - sp->x, sprite[nTarget].y - sp->y);
int nAngDiff = AngleDiff(sprite[nSprite].ang, nAng); int nAngDiff = AngleDiff(sp->ang, nAng);
if (nAngDiff < 64) if (nAngDiff < 64)
{ {
AnubisList[nAnubis].nAction = 2; ap->nAction = 2;
AnubisList[nAnubis].nFrame = 0; ap->nFrame = 0;
} }
break; break;
} }
@ -256,33 +268,33 @@ void FuncAnubis(int a, int nDamage, int nRun)
} }
case 0x8000: case 0x8000:
{ {
sprite[nSprite].ang = (sprite[nSprite].ang + 256) & kAngleMask; sp->ang = (sp->ang + 256) & kAngleMask;
sprite[nSprite].xvel = bcos(sprite[nSprite].ang, -2); sp->xvel = bcos(sp->ang, -2);
sprite[nSprite].yvel = bsin(sprite[nSprite].ang, -2); sp->yvel = bsin(sp->ang, -2);
break; break;
} }
default: default:
{ {
if (AnubisList[nAnubis].g) if (ap->g)
{ {
AnubisList[nAnubis].g--; ap->g--;
} }
else else
{ {
AnubisList[nAnubis].g = 60; ap->g = 60;
if (nTarget > -1) // NOTE: nTarget can be -1. this check wasn't in original code. TODO: demo compatiblity? if (nTarget > -1) // NOTE: nTarget can be -1. this check wasn't in original code. TODO: demo compatiblity?
{ {
if (cansee(sprite[nSprite].x, sprite[nSprite].y, sprite[nSprite].z - GetSpriteHeight(nSprite), sprite[nSprite].sectnum, if (cansee(sp->x, sp->y, sp->z - GetSpriteHeight(nSprite), sp->sectnum,
sprite[nTarget].x, sprite[nTarget].y, sprite[nTarget].z - GetSpriteHeight(nTarget), sprite[nTarget].sectnum)) sprite[nTarget].x, sprite[nTarget].y, sprite[nTarget].z - GetSpriteHeight(nTarget), sprite[nTarget].sectnum))
{ {
sprite[nSprite].xvel = 0; sp->xvel = 0;
sprite[nSprite].yvel = 0; sp->yvel = 0;
sprite[nSprite].ang = GetMyAngle(sprite[nTarget].x - sprite[nSprite].x, sprite[nTarget].y - sprite[nSprite].y); sp->ang = GetMyAngle(sprite[nTarget].x - sp->x, sprite[nTarget].y - sp->y);
AnubisList[nAnubis].nAction = 3; ap->nAction = 3;
AnubisList[nAnubis].nFrame = 0; ap->nFrame = 0;
} }
} }
} }
@ -295,14 +307,14 @@ void FuncAnubis(int a, int nDamage, int nRun)
{ {
if (nTarget == -1) if (nTarget == -1)
{ {
AnubisList[nAnubis].nAction = 0; ap->nAction = 0;
AnubisList[nAnubis].g = 50; ap->g = 50;
} }
else else
{ {
if (PlotCourseToSprite(nSprite, nTarget) >= 768) if (PlotCourseToSprite(nSprite, nTarget) >= 768)
{ {
AnubisList[nAnubis].nAction = 1; ap->nAction = 1;
} }
else else
{ {
@ -319,18 +331,18 @@ void FuncAnubis(int a, int nDamage, int nRun)
{ {
if (bVal) if (bVal)
{ {
AnubisList[nAnubis].nAction = 1; ap->nAction = 1;
sprite[nSprite].xvel = bcos(sprite[nSprite].ang, -2); sp->xvel = bcos(sp->ang, -2);
sprite[nSprite].yvel = bsin(sprite[nSprite].ang, -2); sp->yvel = bsin(sp->ang, -2);
AnubisList[nAnubis].nFrame = 0; ap->nFrame = 0;
} }
else else
{ {
// loc_25718: // loc_25718:
if (nFlag & 0x80) if (nFlag & 0x80)
{ {
BuildBullet(nSprite, 8, 0, 0, -1, sprite[nSprite].ang, nTarget + 10000, 1); BuildBullet(nSprite, 8, 0, 0, -1, sp->ang, nTarget + 10000, 1);
} }
} }
@ -339,13 +351,13 @@ void FuncAnubis(int a, int nDamage, int nRun)
case 4: case 4:
case 5: case 5:
{ {
sprite[nSprite].xvel = 0; sp->xvel = 0;
sprite[nSprite].yvel = 0; sp->yvel = 0;
if (bVal) if (bVal)
{ {
AnubisList[nAnubis].nAction = 1; ap->nAction = 1;
AnubisList[nAnubis].nFrame = 0; ap->nFrame = 0;
} }
return; return;
} }
@ -357,8 +369,8 @@ void FuncAnubis(int a, int nDamage, int nRun)
{ {
if (bVal) if (bVal)
{ {
AnubisList[nAnubis].nAction = (RandomSize(3) % 5) + 6; ap->nAction = (RandomSize(3) % 5) + 6;
AnubisList[nAnubis].nFrame = 0; ap->nFrame = 0;
} }
return; return;
} }
@ -367,18 +379,18 @@ void FuncAnubis(int a, int nDamage, int nRun)
{ {
if (bVal) if (bVal)
{ {
AnubisList[nAnubis].nAction = nAction + 2; ap->nAction = nAction + 2;
AnubisList[nAnubis].nFrame = 0; ap->nFrame = 0;
sprite[nSprite].xvel = 0; sp->xvel = 0;
sprite[nSprite].yvel = 0; sp->yvel = 0;
} }
return; return;
} }
case 13: case 13:
case 14: case 14:
{ {
sprite[nSprite].cstat &= 0xFEFE; sp->cstat &= 0xFEFE;
return; return;
} }
@ -391,13 +403,13 @@ void FuncAnubis(int a, int nDamage, int nRun)
{ {
if (!(sprite[nTarget].cstat & 0x101)) if (!(sprite[nTarget].cstat & 0x101))
{ {
AnubisList[nAnubis].nAction = 0; ap->nAction = 0;
AnubisList[nAnubis].nFrame = 0; ap->nFrame = 0;
AnubisList[nAnubis].g = 100; ap->g = 100;
AnubisList[nAnubis].nTarget = -1; ap->nTarget = -1;
sprite[nSprite].xvel = 0; sp->xvel = 0;
sprite[nSprite].yvel = 0; sp->yvel = 0;
} }
} }
@ -406,7 +418,7 @@ void FuncAnubis(int a, int nDamage, int nRun)
case 0x90000: case 0x90000:
{ {
seq_PlotSequence(a & 0xFFFF, SeqOffsets[kSeqAnubis] + AnubisSeq[nAction].a, AnubisList[nAnubis].nFrame, AnubisSeq[nAction].b); seq_PlotSequence(a & 0xFFFF, SeqOffsets[kSeqAnubis] + AnubisSeq[nAction].a, ap->nFrame, AnubisSeq[nAction].b);
break; break;
} }
@ -423,12 +435,12 @@ void FuncAnubis(int a, int nDamage, int nRun)
{ {
if (nDamage) if (nDamage)
{ {
if (AnubisList[nAnubis].nHealth <= 0) if (ap->nHealth <= 0)
return; return;
AnubisList[nAnubis].nHealth -= nDamage; ap->nHealth -= nDamage;
if (AnubisList[nAnubis].nHealth > 0) if (ap->nHealth > 0)
{ {
short nTarget = a & 0xFFFF; short nTarget = a & 0xFFFF;
@ -440,7 +452,7 @@ void FuncAnubis(int a, int nDamage, int nRun)
if (sprite[nTarget].statnum == 100 || sprite[nTarget].statnum < 199) if (sprite[nTarget].statnum == 100 || sprite[nTarget].statnum < 199)
{ {
if (!RandomSize(5)) { if (!RandomSize(5)) {
AnubisList[nAnubis].nTarget = nTarget; ap->nTarget = nTarget;
} }
} }
@ -448,10 +460,10 @@ void FuncAnubis(int a, int nDamage, int nRun)
{ {
if (nAction >= 6 && nAction <= 10) if (nAction >= 6 && nAction <= 10)
{ {
int nDrumSprite = insertsprite(sprite[nSprite].sectnum, kStatAnubisDrum); int nDrumSprite = insertsprite(sp->sectnum, kStatAnubisDrum);
sprite[nDrumSprite].x = sprite[nSprite].x; sprite[nDrumSprite].x = sp->x;
sprite[nDrumSprite].y = sprite[nSprite].y; sprite[nDrumSprite].y = sp->y;
sprite[nDrumSprite].z = sector[sprite[nDrumSprite].sectnum].floorz; sprite[nDrumSprite].z = sector[sprite[nDrumSprite].sectnum].floorz;
sprite[nDrumSprite].xrepeat = 40; sprite[nDrumSprite].xrepeat = 40;
sprite[nDrumSprite].yrepeat = 40; sprite[nDrumSprite].yrepeat = 40;
@ -460,8 +472,8 @@ void FuncAnubis(int a, int nDamage, int nRun)
BuildObject(nDrumSprite, 2, 0); BuildObject(nDrumSprite, 2, 0);
} }
AnubisList[nAnubis].nAction = 4; ap->nAction = 4;
AnubisList[nAnubis].nFrame = 0; ap->nFrame = 0;
} }
else else
{ {
@ -472,21 +484,21 @@ void FuncAnubis(int a, int nDamage, int nRun)
else else
{ {
// he ded. // he ded.
sprite[nSprite].xvel = 0; sp->xvel = 0;
sprite[nSprite].yvel = 0; sp->yvel = 0;
sprite[nSprite].zvel = 0; sp->zvel = 0;
sprite[nSprite].z = sector[sprite[nSprite].sectnum].floorz; sp->z = sector[sp->sectnum].floorz;
sprite[nSprite].cstat &= 0xFEFE; sp->cstat &= 0xFEFE;
AnubisList[nAnubis].nHealth = 0; ap->nHealth = 0;
nCreaturesKilled++; nCreaturesKilled++;
if (nAction < 11) if (nAction < 11)
{ {
DropMagic(nSprite); DropMagic(nSprite);
AnubisList[nAnubis].nAction = (nMessage == 0xA0000) + 11; ap->nAction = (nMessage == 0xA0000) + 11;
AnubisList[nAnubis].nFrame = 0; ap->nFrame = 0;
} }
} }
} }

1
source/exhumed/src/exhumed.h
View file

@ -247,6 +247,7 @@ struct GameInterface : ::GameInterface
void MenuSound(EMenuSounds snd) override; void MenuSound(EMenuSounds snd) override;
bool StartGame(FNewGameStartup& gs) override; bool StartGame(FNewGameStartup& gs) override;
FSavegameInfo GetSaveSig() override; FSavegameInfo GetSaveSig() override;
void SerializeGameState(FSerializer& arc);
bool LoadGame() override; bool LoadGame() override;
bool SaveGame() override; bool SaveGame() override;
bool CanSave() override; bool CanSave() override;

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

@ -29,6 +29,9 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
BEGIN_PS_NS BEGIN_PS_NS
void SerializeAnubis(FSerializer& arc);
void SaveTextureState(); void SaveTextureState();
void LoadTextureState(); void LoadTextureState();
@ -41,6 +44,12 @@ bool GameInterface::SaveGame()
return 1; // CHECKME return 1; // CHECKME
} }
void GameInterface::SerializeGameState(FSerializer& arc)
{
SerializeAnubis(arc);
}
bool GameInterface::LoadGame() bool GameInterface::LoadGame()
{ {