diff --git a/TR5Main/Game/control.cpp b/TR5Main/Game/control.cpp index ed22fda01..6064d0ed8 100644 --- a/TR5Main/Game/control.cpp +++ b/TR5Main/Game/control.cpp @@ -182,10 +182,6 @@ extern short FXType; extern unordered_map g_AudioTracks; using namespace T5M::Effects::Footprints; extern std::deque footprints; -extern bool BlockAllInput; -extern int skipLoop; -extern int skipFrames; -extern int lockInput; GAME_STATUS ControlPhase(int numFrames, int demoMode) { @@ -202,15 +198,7 @@ GAME_STATUS ControlPhase(int numFrames, int demoMode) SetDebounce = true; - if (skipLoop != -1) - { - if (skipLoop == 0) - return GAME_STATUS_NONE; - else - oldLaraFrame = LaraItem->frameNumber; - } - - for (FramesCount += numFrames; FramesCount > 0; FramesCount -= skipFrames) + for (FramesCount += numFrames; FramesCount > 0; FramesCount -= 2) { GlobalCounter++; @@ -227,15 +215,6 @@ GAME_STATUS ControlPhase(int numFrames, int demoMode) return GAME_STATUS_NONE; } - if (BlockAllInput) - { - DbInput = 0; - TrInput = 0; - } - - if (lockInput) - TrInput = lockInput; - // Has Lara control been disabled? if (DisableLaraControl || CurrentLevel == 0) { @@ -632,12 +611,6 @@ GAME_STATUS ControlPhase(int numFrames, int demoMode) GameTimer++; } - if (skipLoop != -1) - { - if (oldLaraFrame != LaraItem->frameNumber) - --skipLoop; - } - return GAME_STATUS_NONE; } diff --git a/TR5Main/Specific/winmain.cpp b/TR5Main/Specific/winmain.cpp index adbf4555e..02ec01afe 100644 --- a/TR5Main/Specific/winmain.cpp +++ b/TR5Main/Specific/winmain.cpp @@ -35,10 +35,6 @@ extern GameFlow* g_GameFlow; GameScript* g_GameScript; extern GameConfiguration g_Configuration; DWORD MainThreadID; -bool BlockAllInput = true; -int skipLoop = -1; -int skipFrames = 2; -int lockInput = 0; #if _DEBUG string commit; @@ -125,7 +121,6 @@ LRESULT CALLBACK WinAppProc(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam) if ((signed int)(unsigned short)wParam > 0 && (signed int)(unsigned short)wParam <= 2) { //DB_Log(6, "WM_ACTIVE"); - BlockAllInput = false; if (!Debug) ResumeThread((HANDLE)ThreadHandle); @@ -137,7 +132,6 @@ LRESULT CALLBACK WinAppProc(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam) { //DB_Log(6, "WM_INACTIVE"); //DB_Log(5, "HangGameThread"); - BlockAllInput = true; App_Unk00D9ABFD = 1; if (!Debug)