Archive/TombEngine
0
0
Fork 0
mirror of https://github.com/TombEngine/TombEngine.git synced 2025-05-11 04:56:49 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Remove hack remains

Browse source
This commit is contained in:
asasas9500 2021-08-16 18:19:40 -03:00
parent b9c52e1038
commit b04354e35a
2 changed files with 1 additions and 34 deletions
Download patch file Download diff file Expand all files Collapse all files

29
TR5Main/Game/control.cpp
View file

@ -182,10 +182,6 @@ extern short FXType;
extern unordered_map<string, AudioTrack> g_AudioTracks; extern unordered_map<string, AudioTrack> g_AudioTracks;
using namespace T5M::Effects::Footprints; using namespace T5M::Effects::Footprints;
extern std::deque<FOOTPRINT_STRUCT> footprints; extern std::deque<FOOTPRINT_STRUCT> footprints;
extern bool BlockAllInput;
extern int skipLoop;
extern int skipFrames;
extern int lockInput;
GAME_STATUS ControlPhase(int numFrames, int demoMode) GAME_STATUS ControlPhase(int numFrames, int demoMode)
{ {
@ -202,15 +198,7 @@ GAME_STATUS ControlPhase(int numFrames, int demoMode)
SetDebounce = true; SetDebounce = true;
if (skipLoop != -1) for (FramesCount += numFrames; FramesCount > 0; FramesCount -= 2)
{
if (skipLoop == 0)
return GAME_STATUS_NONE;
else
oldLaraFrame = LaraItem->frameNumber;
}
for (FramesCount += numFrames; FramesCount > 0; FramesCount -= skipFrames)
{ {
GlobalCounter++; GlobalCounter++;
@ -227,15 +215,6 @@ GAME_STATUS ControlPhase(int numFrames, int demoMode)
return GAME_STATUS_NONE; return GAME_STATUS_NONE;
} }
if (BlockAllInput)
{
DbInput = 0;
TrInput = 0;
}
if (lockInput)
TrInput = lockInput;
// Has Lara control been disabled? // Has Lara control been disabled?
if (DisableLaraControl || CurrentLevel == 0) if (DisableLaraControl || CurrentLevel == 0)
{ {
@ -632,12 +611,6 @@ GAME_STATUS ControlPhase(int numFrames, int demoMode)
GameTimer++; GameTimer++;
} }
if (skipLoop != -1)
{
if (oldLaraFrame != LaraItem->frameNumber)
--skipLoop;
}
return GAME_STATUS_NONE; return GAME_STATUS_NONE;
} }

6
TR5Main/Specific/winmain.cpp
View file

@ -35,10 +35,6 @@ extern GameFlow* g_GameFlow;
GameScript* g_GameScript; GameScript* g_GameScript;
extern GameConfiguration g_Configuration; extern GameConfiguration g_Configuration;
DWORD MainThreadID; DWORD MainThreadID;
bool BlockAllInput = true;
int skipLoop = -1;
int skipFrames = 2;
int lockInput = 0;
#if _DEBUG #if _DEBUG
string commit; 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) if ((signed int)(unsigned short)wParam > 0 && (signed int)(unsigned short)wParam <= 2)
{ {
//DB_Log(6, "WM_ACTIVE"); //DB_Log(6, "WM_ACTIVE");
BlockAllInput = false;
if (!Debug) if (!Debug)
ResumeThread((HANDLE)ThreadHandle); 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(6, "WM_INACTIVE");
//DB_Log(5, "HangGameThread"); //DB_Log(5, "HangGameThread");
BlockAllInput = true;
App_Unk00D9ABFD = 1; App_Unk00D9ABFD = 1;
if (!Debug) if (!Debug)