teambeef/raze
0
0
Fork 0
mirror of https://github.com/DrBeef/Raze.git synced 2025-02-21 19:21:44 +00:00
Code Issues Projects Releases Packages Wiki Activity

- converted Ra.

Browse source
This commit is contained in:
Christoph Oelckers 2021-10-19 15:06:46 +02:00
parent d023f9633a
commit bf1f87eff9
4 changed files with 38 additions and 35 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
source/games/exhumed/src/aistuff.h
View file

@ -366,11 +366,12 @@ void FuncQueen(int, int, int, int);
struct RA struct RA
{ {
DExhumedActor* pActor;
DExhumedActor* pTarget;
short nAction; short nAction;
short nFrame; short nFrame;
short nRun; short nRun;
short nSprite;
short nTarget;
short field_A; short field_A;
short field_C; short field_C;
short nPlayer; short nPlayer;

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

@ -434,7 +434,7 @@ void GameInterface::Ticker()
sPlayerInput[nLocalPlayer].nAngle = localInput.avel; sPlayerInput[nLocalPlayer].nAngle = localInput.avel;
sPlayerInput[nLocalPlayer].pan = localInput.horz; sPlayerInput[nLocalPlayer].pan = localInput.horz;
Ra[nLocalPlayer].nTarget = besttarget; Ra[nLocalPlayer].pTarget = &exhumedActors[besttarget];
lLocalCodes = 0; lLocalCodes = 0;

2
source/games/exhumed/src/gun.cpp
View file

@ -404,7 +404,7 @@ void MoveWeapons(short nPlayer)
{ {
if (nWeapon == kWeaponRing) if (nWeapon == kWeaponRing)
{ {
if (Ra[nPlayer].nTarget == -1) if (Ra[nPlayer].pTarget == nullptr)
break; break;
Ra[nPlayer].nAction = 0; Ra[nPlayer].nAction = 0;

64
source/games/exhumed/src/ra.cpp
View file

@ -43,8 +43,8 @@ FSerializer& Serialize(FSerializer& arc, const char* keyname, RA& w, RA* def)
{ {
arc ("frame", w.nFrame) arc ("frame", w.nFrame)
("action", w.nAction) ("action", w.nAction)
("sprite", w.nSprite) ("sprite", w.pActor)
("target", w.nTarget) ("target", w.pTarget)
("run", w.nRun) ("run", w.nRun)
("ata", w.field_A) ("ata", w.field_A)
("atc", w.field_C) ("atc", w.field_C)
@ -63,22 +63,22 @@ void SerializeRa(FSerializer& arc)
void FreeRa(short nPlayer) void FreeRa(short nPlayer)
{ {
int nRun = Ra[nPlayer].nRun; int nRun = Ra[nPlayer].nRun;
int nSprite = Ra[nPlayer].nSprite; auto pActor = Ra[nPlayer].pActor;
auto pSprite = &sprite[nSprite]; auto pSprite = &pActor->s();
runlist_SubRunRec(nRun); runlist_SubRunRec(nRun);
runlist_DoSubRunRec(pSprite->owner); runlist_DoSubRunRec(pSprite->owner);
runlist_FreeRun(pSprite->lotag - 1); runlist_FreeRun(pSprite->lotag - 1);
mydeletesprite(nSprite); DeleteActor(pActor);
} }
void BuildRa(short nPlayer) void BuildRa(short nPlayer)
{ {
short nPlayerSprite = PlayerList[nPlayer].nSprite; short nPlayerSprite = PlayerList[nPlayer].nSprite;
int nSprite = insertsprite(sprite[nPlayerSprite].sectnum, 203); auto pActor = insertActor(sprite[nPlayerSprite].sectnum, 203);
auto pSprite = &sprite[nSprite]; auto pSprite = &pActor->s();
pSprite->cstat = 0x8000; pSprite->cstat = 0x8000;
pSprite->xvel = 0; pSprite->xvel = 0;
@ -97,10 +97,10 @@ void BuildRa(short nPlayer)
// GrabTimeSlot(3); // GrabTimeSlot(3);
Ra[nPlayer].nSprite = nSprite; Ra[nPlayer].pActor = pActor;
Ra[nPlayer].nRun = runlist_AddRunRec(NewRun, nPlayer, 0x210000); Ra[nPlayer].nRun = runlist_AddRunRec(NewRun, nPlayer, 0x210000);
Ra[nPlayer].nTarget = -1; Ra[nPlayer].pTarget = nullptr;
Ra[nPlayer].nFrame = 0; Ra[nPlayer].nFrame = 0;
Ra[nPlayer].nAction = 0; Ra[nPlayer].nAction = 0;
Ra[nPlayer].field_C = 0; Ra[nPlayer].field_C = 0;
@ -114,16 +114,17 @@ void InitRa()
void MoveRaToEnemy(short nPlayer) void MoveRaToEnemy(short nPlayer)
{ {
short nTarget = Ra[nPlayer].nTarget; auto pTarget = Ra[nPlayer].pTarget;
short nSprite = Ra[nPlayer].nSprite; auto pActor = Ra[nPlayer].pActor;
short nAction = Ra[nPlayer].nAction; short nAction = Ra[nPlayer].nAction;
auto pSprite = &sprite[nSprite]; auto pSprite = &pActor->s();
if (nTarget != -1) if (pTarget)
{ {
if (!(sprite[nTarget].cstat & 0x101) || sprite[nTarget].sectnum == MAXSECTORS) auto pTargSprite = &pTarget->s();
if (!(pTargSprite->cstat & 0x101) || pTargSprite->sectnum == MAXSECTORS)
{ {
Ra[nPlayer].nTarget = -1; Ra[nPlayer].pTarget = nullptr;
if (nAction == 0 || nAction == 3) { if (nAction == 0 || nAction == 3) {
return; return;
} }
@ -134,8 +135,8 @@ void MoveRaToEnemy(short nPlayer)
} }
else else
{ {
if (pSprite->sectnum != sprite[nTarget].sectnum) { if (pSprite->sectnum != pTargSprite->sectnum) {
mychangespritesect(nSprite, sprite[nTarget].sectnum); ChangeActorSect(pActor, pTargSprite->sectnum);
} }
} }
} }
@ -153,15 +154,16 @@ void MoveRaToEnemy(short nPlayer)
} }
pSprite->cstat = 0x8000; pSprite->cstat = 0x8000;
nTarget = PlayerList[nPlayer].nSprite; pTarget = PlayerList[nPlayer].Actor();
} }
auto pTargSprite = &pTarget->s();
pSprite->x = sprite[nTarget].x; pSprite->x = pTargSprite->x;
pSprite->y = sprite[nTarget].y; pSprite->y = pTargSprite->y;
pSprite->z = sprite[nTarget].z - GetSpriteHeight(nTarget); pSprite->z = pTargSprite->z - GetActorHeight(pTarget);
if (pSprite->sectnum != sprite[nTarget].sectnum) { if (pSprite->sectnum != pTargSprite->sectnum) {
mychangespritesect(nSprite, sprite[nTarget].sectnum); ChangeActorSect(pActor, pTargSprite->sectnum);
} }
} }
@ -171,17 +173,17 @@ void AIRa::Tick(RunListEvent* ev)
short nCurrentWeapon = PlayerList[nPlayer].nCurrentWeapon; short nCurrentWeapon = PlayerList[nPlayer].nCurrentWeapon;
short nSeq = SeqOffsets[kSeqEyeHit] + RaSeq[Ra[nPlayer].nAction].a; short nSeq = SeqOffsets[kSeqEyeHit] + RaSeq[Ra[nPlayer].nAction].a;
short nSprite = Ra[nPlayer].nSprite; auto pActor = Ra[nPlayer].pActor;
auto pSprite = &sprite[nSprite]; auto pSprite = &pActor->s();
bool bVal = false; bool bVal = false;
Ra[nPlayer].nTarget = sPlayerInput[nPlayer].nTarget; Ra[nPlayer].pTarget = sPlayerInput[nPlayer].nTarget <= -1? nullptr : &exhumedActors[sPlayerInput[nPlayer].nTarget] ;
pSprite->picnum = seq_GetSeqPicnum2(nSeq, Ra[nPlayer].nFrame); pSprite->picnum = seq_GetSeqPicnum2(nSeq, Ra[nPlayer].nFrame);
if (Ra[nPlayer].nAction) if (Ra[nPlayer].nAction)
{ {
seq_MoveSequence(nSprite, nSeq, Ra[nPlayer].nFrame); seq_MoveSequence(pActor, nSeq, Ra[nPlayer].nFrame);
Ra[nPlayer].nFrame++; Ra[nPlayer].nFrame++;
if (Ra[nPlayer].nFrame >= SeqSize[nSeq]) if (Ra[nPlayer].nFrame >= SeqSize[nSeq])
@ -197,7 +199,7 @@ void AIRa::Tick(RunListEvent* ev)
{ {
MoveRaToEnemy(nPlayer); MoveRaToEnemy(nPlayer);
if (!Ra[nPlayer].field_C || Ra[nPlayer].nTarget <= -1) if (!Ra[nPlayer].field_C || Ra[nPlayer].pTarget == nullptr)
{ {
pSprite->cstat = 0x8000; pSprite->cstat = 0x8000;
} }
@ -241,7 +243,7 @@ void AIRa::Tick(RunListEvent* ev)
} }
else else
{ {
if (Ra[nPlayer].nFrame || Ra[nPlayer].nTarget <= -1) if (Ra[nPlayer].nFrame || Ra[nPlayer].pTarget == nullptr)
{ {
if (!bVal) { if (!bVal) {
return; return;
@ -254,9 +256,9 @@ void AIRa::Tick(RunListEvent* ev)
{ {
if (PlayerList[nPlayer].nAmmo[kWeaponRing] > 0) if (PlayerList[nPlayer].nAmmo[kWeaponRing] > 0)
{ {
runlist_DamageEnemy(Ra[nPlayer].nTarget, PlayerList[Ra[nPlayer].nPlayer].nSprite, BulletInfo[kWeaponRing].nDamage); runlist_DamageEnemy(Ra[nPlayer].pTarget, PlayerList[Ra[nPlayer].nPlayer].Actor(), BulletInfo[kWeaponRing].nDamage);
AddAmmo(nPlayer, kWeaponRing, -WeaponInfo[kWeaponRing].d); AddAmmo(nPlayer, kWeaponRing, -WeaponInfo[kWeaponRing].d);
SetQuake(nSprite, 100); SetQuake(pActor, 100);
} }
else else
{ {