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

- Exhumed: Move PlayerInput::nItem to Player struct as Player::nCurrentItem.

Browse source
This commit is contained in:
Mitchell Richters 2023-03-13 20:29:04 +11:00
parent f77b1007be
commit 73acffac2c
4 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -438,7 +438,7 @@ void GameInterface::Ticker()
{
if (nItemMagic[i] <= PlayerList[nLocalPlayer].nMagic)
{
sPlayerInput[nLocalPlayer].nItem = i;
PlayerList[nLocalPlayer].nCurrentItem = i;
break;
}
}

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

@ -35,7 +35,6 @@ struct PlayerInput
DVector2 vel;
float nAngle;
float pan;
int8_t nItem;
ESyncBits actions;
int getNewWeapon() const

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

@ -433,7 +433,7 @@ void RestartPlayer(int nPlayer)
plr->ototalvel = plr->totalvel = 0;
memset(&sPlayerInput[nPlayer], 0, sizeof(PlayerInput));
sPlayerInput[nPlayer].nItem = -1;
PlayerList[nPlayer].nCurrentItem = -1;
plr->nDeathType = 0;
nQuake[nPlayer] = 0;
@ -908,10 +908,10 @@ void AIPlayer::Tick(RunListEvent* ev)
pPlayerActor->vel.XY() = sPlayerInput[nPlayer].vel;
if (sPlayerInput[nPlayer].nItem > -1)
if (PlayerList[nPlayer].nCurrentItem > -1)
{
UseItem(nPlayer, sPlayerInput[nPlayer].nItem);
sPlayerInput[nPlayer].nItem = -1;
UseItem(nPlayer, PlayerList[nPlayer].nCurrentItem);
PlayerList[nPlayer].nCurrentItem = -1;
}
pPlayerActor->spr.picnum = seq_GetSeqPicnum(PlayerList[nPlayer].nSeq, PlayerSeq[nHeightTemplate[nAction]].a, PlayerList[nPlayer].nSeqSize);

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

@ -65,6 +65,7 @@ struct Player
uint16_t keys;
int16_t nMagic;
int16_t nItem;
int8_t nCurrentItem;
uint8_t items[8];
int16_t nAmmo[7]; // TODO - kMaxWeapons?