diff --git a/source/games/exhumed/src/exhumed.h b/source/games/exhumed/src/exhumed.h index 40d5d7a47..34045cb5e 100644 --- a/source/games/exhumed/src/exhumed.h +++ b/source/games/exhumed/src/exhumed.h @@ -79,7 +79,6 @@ void StatusMessage(int messageTime, const char *fmt, ...); void DoSpiritHead(); -void CheckKeys2(); void GameTicker(); void InitLevel(MapRecord*); void InitNewGame(); diff --git a/source/games/exhumed/src/gameloop.cpp b/source/games/exhumed/src/gameloop.cpp index f7c42b308..615b5f486 100644 --- a/source/games/exhumed/src/gameloop.cpp +++ b/source/games/exhumed/src/gameloop.cpp @@ -65,7 +65,6 @@ void DoTitle(CompletionFunc completion); void GameInterface::Render() { - CheckKeys2(); drawtime.Reset(); drawtime.Clock(); diff --git a/source/games/exhumed/src/init.cpp b/source/games/exhumed/src/init.cpp index 478dd1498..3e58dcf0a 100644 --- a/source/games/exhumed/src/init.cpp +++ b/source/games/exhumed/src/init.cpp @@ -104,7 +104,6 @@ uint8_t LoadLevel(MapRecord* map) InitPushBlocks(); InitPlayer(); InitItems(); - InitInput(); if (map->gameflags & LEVEL_EX_COUNTDOWN) { InitEnergyTile(); diff --git a/source/games/exhumed/src/input.cpp b/source/games/exhumed/src/input.cpp index 1801b721c..40befed09 100644 --- a/source/games/exhumed/src/input.cpp +++ b/source/games/exhumed/src/input.cpp @@ -25,45 +25,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. BEGIN_PS_NS -short nInputStack = 0; - -short bStackNode[kMaxPlayers]; - -short nTypeStack[kMaxPlayers]; PlayerInput sPlayerInput[kMaxPlayers]; -int *pStackPtr; - -// (nInputStack * 32) - 11; - -void PushInput(PlayerInput *pInput, int edx) -{ - if (!bStackNode[edx]) - { -// memcpy(sInputStack[nInputStack], pInput, - } -} - -int PopInput() -{ - if (!nInputStack) - return -1; - - nInputStack--; - - // TEMP - return 0; -} - -void InitInput() -{ - memset(nTypeStack, 0, sizeof(nTypeStack)); - nInputStack = 0; - memset(bStackNode, 0, sizeof(bStackNode)); - -// pStackPtr = &sInputStack; -} - void ClearSpaceBar(short nPlayer) { sPlayerInput[nPlayer].actions &= SB_OPEN; @@ -71,22 +34,6 @@ void ClearSpaceBar(short nPlayer) } -void BackupInput() -{ - -} - -void SendInput() -{ - -} - - -void CheckKeys2() -{ -} - - void GameInterface::GetInput(InputPacket* packet, ControlInfo* const hidInput) { if (paused || M_Active()) @@ -122,11 +69,7 @@ void GameInterface::GetInput(InputPacket* packet, ControlInfo* const hidInput) { pPlayer->angle.applyinput(input.avel, &sPlayerInput[nLocalPlayer].actions, scaleAdjust); pPlayer->horizon.applyinput(input.horz, &sPlayerInput[nLocalPlayer].actions, scaleAdjust); - - if (input.horz) - { - pPlayer->bPlayerPan = pPlayer->bLockPan = true; - } + pPlayer->bPlayerPan = pPlayer->bLockPan = input.horz != 0; } pPlayer->angle.processhelpers(scaleAdjust); diff --git a/source/games/exhumed/src/input.h b/source/games/exhumed/src/input.h index 8b865c51c..b57eac2e7 100644 --- a/source/games/exhumed/src/input.h +++ b/source/games/exhumed/src/input.h @@ -54,8 +54,6 @@ struct PlayerInput }; -void InitInput(); - void ClearSpaceBar(short nPlayer); int GetLocalInput();