Max/PDModdingCommunity_PD-Loader
1
0
Fork 0
Code Issues 5 Pull Requests 1 Actions Packages Projects Releases 5 Wiki Activity

pause: prevent pausing during loading screen, clear give up flag after exiting gameplay, work towards restart

Browse Source
This commit is contained in:
somewhatlurker
2020-02-25 00:15:05 +11:00
parent b48e14a47e
commit ab288a3085
2 changed files with 67 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
source-code/source/plugins/TLAC/Components/Pause.cpp
+19 -2
View File
@@ -17,6 +17,7 @@ namespace TLAC::Components
bool Pause::pause = false;
bool Pause::isPaused = false;
bool Pause::giveUp = false;
bool Pause::autoPause = false;
bool Pause::showUI = true;
int Pause::selResultAet1 = 0;
int Pause::selResultAet2 = 0;
@@ -181,6 +182,17 @@ namespace TLAC::Components
}
}
/* for testing `-ss` stuff
if (inputState->Tapped.Buttons & JVS_TRIANGLE)
{
void** ScreenShotImplAddr = (void**)0x1412016d0;
Drawing::MsString path; // just a small struct from TLAC::Utilities::Drawing::MsString
path.SetCharBuf("blahblahblah");
((void(*)(void* impl, Drawing::MsString* path, int width, int height))0x140557210)(*ScreenShotImplAddr, &path, 1280, 720);
}
*/
// only process menu events when UI is visible
if (showUI)
{
@@ -293,6 +305,11 @@ namespace TLAC::Components
pause = true;
}
}
else
{
// ensure giveUp isn't retained after already quitting
giveUp = false;
}
}
// swallow filtered button inputs
@@ -550,7 +567,7 @@ namespace TLAC::Components
void Pause::OnFocusLost()
{
if (isInGame() && autoPause)
if (autoPause && isInGame())
pause = true;
}
@@ -561,7 +578,7 @@ namespace TLAC::Components
bool Pause::isInGame()
{
return *(GameState*)CURRENT_GAME_STATE_ADDRESS == GS_GAME && *(SubGameState*)CURRENT_GAME_SUB_STATE_ADDRESS == SUB_GAME_MAIN;
return *(GameState*)CURRENT_GAME_STATE_ADDRESS == GS_GAME && *(SubGameState*)CURRENT_GAME_SUB_STATE_ADDRESS == SUB_GAME_MAIN && *(uint8_t*)PV_STATE_ADDRESS == 1;
}
bool Pause::hookedGiveUpFunc(void* cls)