diff --git a/source/games/exhumed/src/exhumed.cpp b/source/games/exhumed/src/exhumed.cpp index 5c698221b..734e0a2ce 100644 --- a/source/games/exhumed/src/exhumed.cpp +++ b/source/games/exhumed/src/exhumed.cpp @@ -438,7 +438,7 @@ void GameInterface::Ticker() { if (nItemMagic[i] <= PlayerList[nLocalPlayer].nMagic) { - sPlayerInput[nLocalPlayer].nItem = i; + PlayerList[nLocalPlayer].nCurrentItem = i; break; } } diff --git a/source/games/exhumed/src/input.h b/source/games/exhumed/src/input.h index 1954398db..6467df723 100644 --- a/source/games/exhumed/src/input.h +++ b/source/games/exhumed/src/input.h @@ -35,7 +35,6 @@ struct PlayerInput DVector2 vel; float nAngle; float pan; - int8_t nItem; ESyncBits actions; int getNewWeapon() const diff --git a/source/games/exhumed/src/player.cpp b/source/games/exhumed/src/player.cpp index 28898942f..9377a5330 100644 --- a/source/games/exhumed/src/player.cpp +++ b/source/games/exhumed/src/player.cpp @@ -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); diff --git a/source/games/exhumed/src/player.h b/source/games/exhumed/src/player.h index 149a7f35f..c755e898a 100644 --- a/source/games/exhumed/src/player.h +++ b/source/games/exhumed/src/player.h @@ -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?