From 4540264c962426d28b610d34ca227c016f2a20e7 Mon Sep 17 00:00:00 2001 From: somewhatlurker <52014015+somewhatlurker@users.noreply.github.com> Date: Mon, 21 Oct 2019 13:46:34 +1100 Subject: [PATCH] pause: cleanup, remove an unused hook --- .../TLAC/Components/ComponentsManager.cpp | 8 ---- .../TLAC/Components/ComponentsManager.h | 1 - .../TLAC/Components/EmulatorComponent.h | 1 - .../source/plugins/TLAC/Components/Pause.cpp | 48 +++++++++++-------- .../source/plugins/TLAC/Components/Pause.h | 14 ++++-- source-code/source/plugins/TLAC/dllmain.cpp | 17 ------- 6 files changed, 37 insertions(+), 52 deletions(-) diff --git a/source-code/source/plugins/TLAC/Components/ComponentsManager.cpp b/source-code/source/plugins/TLAC/Components/ComponentsManager.cpp index 22e099d..a74eb62 100644 --- a/source-code/source/plugins/TLAC/Components/ComponentsManager.cpp +++ b/source-code/source/plugins/TLAC/Components/ComponentsManager.cpp @@ -151,14 +151,6 @@ namespace TLAC::Components } } - void ComponentsManager::UpdatePostDraw() - { - for (auto& component : components) - { - component->UpdatePostDraw(); - } - } - void ComponentsManager::OnFocusGain() { for (auto& component : components) diff --git a/source-code/source/plugins/TLAC/Components/ComponentsManager.h b/source-code/source/plugins/TLAC/Components/ComponentsManager.h index cc1a397..e7269b3 100644 --- a/source-code/source/plugins/TLAC/Components/ComponentsManager.h +++ b/source-code/source/plugins/TLAC/Components/ComponentsManager.h @@ -29,7 +29,6 @@ namespace TLAC::Components void UpdateInput(); void UpdatePostInput(); void UpdateDrawSprites(); - void UpdatePostDraw(); void OnFocusGain(); void OnFocusLost(); void Dispose(); diff --git a/source-code/source/plugins/TLAC/Components/EmulatorComponent.h b/source-code/source/plugins/TLAC/Components/EmulatorComponent.h index 69f63e8..f46b98d 100644 --- a/source-code/source/plugins/TLAC/Components/EmulatorComponent.h +++ b/source-code/source/plugins/TLAC/Components/EmulatorComponent.h @@ -18,7 +18,6 @@ namespace TLAC::Components virtual void UpdateInput() {}; virtual void UpdatePostInput() {}; virtual void UpdateDrawSprites() {}; - virtual void UpdatePostDraw() {}; virtual void OnFocusGain() {}; virtual void OnFocusLost() {}; diff --git a/source-code/source/plugins/TLAC/Components/Pause.cpp b/source-code/source/plugins/TLAC/Components/Pause.cpp index 2fd9772..c4f18da 100644 --- a/source-code/source/plugins/TLAC/Components/Pause.cpp +++ b/source-code/source/plugins/TLAC/Components/Pause.cpp @@ -2,7 +2,6 @@ #include "../Constants.h" #include "GameState.h" #include "Drawing.h" -#include "Input/InputState.h" #include "GL/glut.h" #include "detours.h" #include @@ -17,12 +16,14 @@ namespace TLAC::Components bool Pause::showUI = true; unsigned int Pause::menuPos = 0; unsigned int Pause::mainMenuPos = 0; - unsigned int Pause::menuSet = menuset_main; + unsigned int Pause::menuSet = MENUSET_MAIN; std::chrono::time_point Pause::menuItemSelectTime; std::vector Pause::origAetMovOp; std::vector Pause::origFramespeedOp; std::vector Pause::streamPlayStates; bool(*divaGiveUpFunc)(void*) = (bool(*)(void* cls))GIVEUP_FUNC_ADDRESS; + InputState* Pause::inputState; + PlayerData* Pause::playerData; Pause::Pause() { @@ -37,13 +38,21 @@ namespace TLAC::Components return "pause"; } - void Pause::Initialize(ComponentsManager*) + void Pause::saveOldPatchOps() { origAetMovOp.resize(8); memcpy(&origAetMovOp[0], aetMovPatchAddress, 8); origFramespeedOp.resize(4); memcpy(&origFramespeedOp[0], framespeedPatchAddress, 4); + } + + void Pause::Initialize(ComponentsManager*) + { + inputState = (InputState*)(*(uint64_t*)INPUT_STATE_PTR_ADDRESS); + playerData = (PlayerData*)PLAYER_DATA_ADDRESS; + + saveOldPatchOps(); DetourTransactionBegin(); DetourUpdateThread(GetCurrentThread()); @@ -65,6 +74,7 @@ namespace TLAC::Components { ((void(*)())DSC_PAUSE_FUNC_ADDRESS)(); + saveOldPatchOps(); InjectCode(aetMovPatchAddress, { 0x90, 0x90, 0x90, 0x90, 0x90, 0x90, 0x90, 0x90 }); InjectCode(framespeedPatchAddress, { 0x0f, 0x57, 0xc0, 0xc3 }); // XORPS XMM0,XMM0; RET @@ -83,7 +93,7 @@ namespace TLAC::Components } menuPos = 0; - menuSet = menuset_main; + menuSet = MENUSET_MAIN; showUI = true; menuItemSelectTime = std::chrono::high_resolution_clock::now(); isPaused = true; @@ -96,8 +106,6 @@ namespace TLAC::Components } else { - InputState* inputState = (InputState*)(*(uint64_t*)INPUT_STATE_PTR_ADDRESS); - if (inputState->Tapped.Buttons & JVS_SQUARE) showUI = !showUI; @@ -118,9 +126,9 @@ namespace TLAC::Components if (inputState->Tapped.Buttons & JVS_TRIANGLE) { - if (menuSet != menuset_main) + if (menuSet != MENUSET_MAIN) { - menuSet = menuset_main; + menuSet = MENUSET_MAIN; menuPos = mainMenuPos; menuItemSelectTime = std::chrono::high_resolution_clock::now(); } @@ -128,7 +136,7 @@ namespace TLAC::Components menuPos %= menuItems[menuSet].size(); - if (menuSet == menuset_main) + if (menuSet == MENUSET_MAIN) mainMenuPos = menuPos; // use released when unpausing from X so it doesn't trigger input @@ -139,14 +147,13 @@ namespace TLAC::Components if (inputState->Released.Buttons & JVS_CIRCLE) menuItems[menuSet][menuPos].second(); - if (menuSet == menuset_sevol) + if (menuSet == MENUSET_SEVOL) { - PlayerData* playerdata = (PlayerData*)PLAYER_DATA_ADDRESS; const char volformat[] = "%d"; - size_t size = snprintf(nullptr, 0, volformat, playerdata->act_vol) + 1; + size_t size = snprintf(nullptr, 0, volformat, playerData->act_vol) + 1; char* buf = new char[size]; - snprintf(buf, size, volformat, playerdata->act_vol); - menuItems[menuset_sevol][1].first = buf; + snprintf(buf, size, volformat, playerData->act_vol); + menuItems[MENUSET_SEVOL][1].first = buf; delete[] buf; } } @@ -300,7 +307,7 @@ namespace TLAC::Components dtParams.yCurrent = dtParams.yBegin; dtParams.colour = 0xffffffff; drawTextW(&dtParams, (drawTextFlags)(DRAWTEXT_ENABLE_LAYOUT), L"L/R:Move　"); - if (menuSet != menuset_main) + if (menuSet != MENUSET_MAIN) { dtParams.colour = 0xff40ff40; drawTextW(&dtParams, (drawTextFlags)(DRAWTEXT_ENABLE_LAYOUT), L"△"); @@ -324,7 +331,7 @@ namespace TLAC::Components bool Pause::isPauseKeyTapped() { - return ((InputState*)(*(uint64_t*)INPUT_STATE_PTR_ADDRESS))->Tapped.Buttons & JVS_START; + return inputState->Tapped.Buttons & JVS_START; } bool Pause::hookedGiveUpFunc(void* cls) @@ -348,11 +355,10 @@ namespace TLAC::Components void Pause::setSEVolume(int amount) { - PlayerData* playerdata = (PlayerData*)PLAYER_DATA_ADDRESS; - playerdata->act_vol += amount; - if (playerdata->act_vol < 0) playerdata->act_vol = 0; - if (playerdata->act_vol > 100) playerdata->act_vol = 100; - playerdata->act_slide_vol = playerdata->act_vol; + playerData->act_vol += amount; + if (playerData->act_vol < 0) playerData->act_vol = 0; + if (playerData->act_vol > 100) playerData->act_vol = 100; + playerData->act_slide_vol = playerData->act_vol; } void Pause::InjectCode(void* address, const std::vector data) diff --git a/source-code/source/plugins/TLAC/Components/Pause.h b/source-code/source/plugins/TLAC/Components/Pause.h index c99d1fa..b9ddc22 100644 --- a/source-code/source/plugins/TLAC/Components/Pause.h +++ b/source-code/source/plugins/TLAC/Components/Pause.h @@ -2,6 +2,7 @@ #include "../Constants.h" #include "EmulatorComponent.h" #include "PlayerData.h" +#include "Input/InputState.h" #include #include #include @@ -31,6 +32,8 @@ namespace TLAC::Components static bool isPaused; // tracks internal state + static void saveOldPatchOps(); + static std::vector origAetMovOp; static constexpr uint8_t* aetMovPatchAddress = (uint8_t*)0x1401703b3; @@ -41,6 +44,9 @@ namespace TLAC::Components static void setSEVolume(int amount); + static PlayerData* playerData; + static InputState* inputState; + static const int menuX = 640; static const int menuY = 360; static const int menuItemHeight = 36; @@ -55,15 +61,15 @@ namespace TLAC::Components enum menusets { - menuset_main = 0, - menuset_sevol = 1, + MENUSET_MAIN = 0, + MENUSET_SEVOL = 1, }; - static void mainmenu() { menuSet = menuset_main; menuPos = mainMenuPos; menuItemSelectTime = std::chrono::high_resolution_clock::now(); }; + static void mainmenu() { menuSet = MENUSET_MAIN; menuPos = mainMenuPos; menuItemSelectTime = std::chrono::high_resolution_clock::now(); }; static void unpause() { pause = false; }; static void giveup() { giveUp = true; }; - static void sevolmenu() { menuSet = menuset_sevol; menuPos = 1; menuItemSelectTime = std::chrono::high_resolution_clock::now(); }; + static void sevolmenu() { menuSet = MENUSET_SEVOL; menuPos = 1; menuItemSelectTime = std::chrono::high_resolution_clock::now(); }; static void sevolplus() { setSEVolume(10); }; static void sevolminus() { setSEVolume(-10); }; diff --git a/source-code/source/plugins/TLAC/dllmain.cpp b/source-code/source/plugins/TLAC/dllmain.cpp index 6bdf252..36139f3 100644 --- a/source-code/source/plugins/TLAC/dllmain.cpp +++ b/source-code/source/plugins/TLAC/dllmain.cpp @@ -20,7 +20,6 @@ void(__cdecl* divaEngineUpdate)() = (void(__cdecl*)())0x14018CC40; void(__cdecl* divaEngineDrawSprites)(void* addr, int idk) = (void(__cdecl*)(void* addr, int idk))ENGINE_DRAW_SPRITES_ADDRESS; -void(__cdecl* divaEngineFinishDraw)() = (void(__cdecl*)())ENGINE_FINISH_DRAW_ADDRESS; LRESULT CALLBACK MessageWindowProcessCallback(HWND, UINT, WPARAM, LPARAM); DWORD WINAPI WindowMessageDispatcher(LPVOID); @@ -133,11 +132,6 @@ namespace TLAC ComponentsManager.UpdateDrawSprites(); } - void UpdatePostDraw() - { - ComponentsManager.UpdatePostDraw(); - } - void InitializeExtraSettings() { const LPCTSTR RESOLUTION_CONFIG_FILE_NAME = _T(".\\config.ini"); @@ -361,12 +355,6 @@ void hookedEngineDrawSprites(void* addr, int idk) TLAC::UpdateDrawSprites(); } -void hookedEngineFinishDraw() -{ - TLAC::UpdatePostDraw(); - divaEngineFinishDraw(); -} - BOOL APIENTRY DllMain(HMODULE hModule, DWORD ul_reason_for_call, LPVOID lpReserved) { HWND consoleHandle = GetConsoleWindow(); @@ -393,11 +381,6 @@ BOOL APIENTRY DllMain(HMODULE hModule, DWORD ul_reason_for_call, LPVOID lpReser DetourAttach(&(PVOID&)divaEngineDrawSprites, hookedEngineDrawSprites); DetourTransactionCommit(); - DetourTransactionBegin(); - DetourUpdateThread(GetCurrentThread()); - DetourAttach(&(PVOID&)divaEngineFinishDraw, hookedEngineFinishDraw); - DetourTransactionCommit(); - TLAC::InitializeExtraSettings(); TLAC::framework::Module = hModule;