diff --git a/UnleashedRecomp/game.cpp b/UnleashedRecomp/game.cpp index 88f600c..7ee8d3c 100644 --- a/UnleashedRecomp/game.cpp +++ b/UnleashedRecomp/game.cpp @@ -1,23 +1,11 @@ #include #include "api/SWA.h" #include "ui/window.h" -#include "game.h" constexpr float m_baseAspectRatio = 16.0f / 9.0f; uint32_t m_lastCheckpointScore = 0; -void Game::Exit() -{ - s_isSignalExit = true; -} - -bool GracefulLoopExitMidAsmHook() -{ - // TODO (Sajid): investigate XAM handle closing causing assertion failure here. - return Game::s_isSignalExit; -} - #pragma region Aspect Ratio Hooks bool CameraAspectRatioMidAsmHook(PPCRegister& r31) diff --git a/UnleashedRecomp/game.h b/UnleashedRecomp/game.h deleted file mode 100644 index fa8746f..0000000 --- a/UnleashedRecomp/game.h +++ /dev/null @@ -1,9 +0,0 @@ -#pragma once - -class Game -{ -public: - inline static bool s_isSignalExit = false; - - static void Exit(); -}; diff --git a/UnleashedRecomp/ui/window.cpp b/UnleashedRecomp/ui/window.cpp index ce5d5e9..3c726cd 100644 --- a/UnleashedRecomp/ui/window.cpp +++ b/UnleashedRecomp/ui/window.cpp @@ -2,7 +2,6 @@ #include #include #include -#include "game.h" bool m_isFullscreenKeyReleased = true; @@ -11,7 +10,6 @@ int Window_OnSDLEvent(void*, SDL_Event* event) // TODO (Hyper): prevent window changes during boot to avoid buffer resize crashes. switch (event->type) { - // TODO: use Game::Exit(). case SDL_QUIT: ExitProcess(0); break; diff --git a/UnleashedRecompLib/config/SWA.toml b/UnleashedRecompLib/config/SWA.toml index 147927b..d3c718e 100644 --- a/UnleashedRecompLib/config/SWA.toml +++ b/UnleashedRecompLib/config/SWA.toml @@ -104,11 +104,6 @@ name = "Primitive2DHalfPixelOffsetMidAsmHook" address = 0x830D213C registers = ["f13"] -[[midasm_hook]] -name = "GracefulLoopExitMidAsmHook" -address = 0x822C1018 -return_on_true = true - [[midasm_hook]] name = "CameraAspectRatioMidAsmHook" address = 0x82468E84