zdoom/raze
0
0
Fork 0
mirror of https://github.com/ZDoom/Raze.git synced 2024-11-15 00:42:08 +00:00
Code Issues Projects Releases Packages Wiki Activity

- Exhumed: A little bit more cleanup.

Browse source
This commit is contained in:
Mitchell Richters 2023-10-05 14:07:04 +11:00 committed by Christoph Oelckers
parent 83cd140d75
commit b83f062037
3 changed files with 14 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -97,7 +97,7 @@ void FuncFishLimb(int a, int b, int c);
enum { kMaxGrenades = 50 };
void BuildGrenade(DExhumedPlayer* const pPlayer);
void ThrowGrenade(int nPlayer, double ecx, double push1);
void ThrowGrenade(DExhumedPlayer* const pPlayer, double ecx, double push1);
void FuncGrenade(int, int, int, int);
// gun
@ -158,7 +158,6 @@ void BuildItemAnim(DExhumedActor* nSprite);
void ItemFlash();
void FillItems(DExhumedPlayer* const pPlayer);
void UseItem(DExhumedPlayer* const pPlayer, int nItem);
void UseCurItem(int nPlayer);
int GrabItem(DExhumedPlayer* const pPlayer, int nItem);
void DropMagic(DExhumedActor* actor);
void InitItems();
@ -312,7 +311,7 @@ struct RA
extern RA Ra[];
void FreeRa(int nPlayer);
void BuildRa(int nPlayer);
void BuildRa(DExhumedPlayer* const pPlayer);
void InitRa();
void MoveRaToEnemy(RA* const pRa);
void FuncRa(int, int, int, int);

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

@ -321,7 +321,7 @@ void RestartPlayer(DExhumedPlayer* const pPlayer)
pPlayer->nMagic = 0;
}
BuildRa(pPlayer->pnum);
BuildRa(pPlayer);
}
//---------------------------------------------------------------------------

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

@ -106,9 +106,10 @@ void FreeRa(int nPlayer)
//
//---------------------------------------------------------------------------
void BuildRa(int nPlayer)
void BuildRa(DExhumedPlayer* const pPlayer)
{
auto pPlayerActor = getPlayer(nPlayer)->GetActor();
auto pPlayerActor = pPlayer->GetActor();
auto pRa = &Ra[pPlayer->pnum];
auto pActor = insertActor(pPlayerActor->sector(), 203);
@ -119,7 +120,7 @@ void BuildRa(int nPlayer)
pActor->spr.extra = -1;
pActor->spr.lotag = runlist_HeadRun() + 1;
pActor->spr.hitag = 0;
pActor->spr.intowner = runlist_AddRunRec(pActor->spr.lotag - 1, nPlayer, 0x210000);
pActor->spr.intowner = runlist_AddRunRec(pActor->spr.lotag - 1, pPlayer->pnum, 0x210000);
pActor->spr.pal = 1;
pActor->spr.scale = DVector2(1, 1);
pActor->spr.pos = pPlayerActor->spr.pos;
@ -127,14 +128,14 @@ void BuildRa(int nPlayer)
// GrabTimeSlot(3);
Ra[nPlayer].pActor = pActor;
pRa->pActor = pActor;
Ra[nPlayer].nRun = runlist_AddRunRec(NewRun, nPlayer, 0x210000);
Ra[nPlayer].pTarget = nullptr;
Ra[nPlayer].nFrame = 0;
Ra[nPlayer].nAction = 0;
Ra[nPlayer].nState = 0;
Ra[nPlayer].nPlayer = nPlayer;
pRa->nRun = runlist_AddRunRec(NewRun, pPlayer->pnum, 0x210000);
pRa->pTarget = nullptr;
pRa->nFrame = 0;
pRa->nAction = 0;
pRa->nState = 0;
pRa->nPlayer = pPlayer->pnum;
}
void InitRa()