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

pause: pause on focus lost (+ some minor cleanup)

Browse Source
This commit is contained in:
somewhatlurker
2019-10-23 11:17:58 +11:00
parent e007750af1
commit b337b45e9f
2 changed files with 23 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
source-code/source/plugins/TLAC/Components/Pause.cpp
+17 -2
View File
@@ -14,6 +14,10 @@ namespace TLAC::Components
bool Pause::isPaused = false;
bool Pause::giveUp = false;
bool Pause::showUI = true;
int Pause::triangleAet = 0;
int Pause::squareAet = 0;
int Pause::crossAet = 0;
int Pause::circleAet = 0;
int Pause::curMenuPos = 0;
int Pause::mainMenuPos = 0;
Pause::menusets Pause::curMenuSet = MENUSET_MAIN;
@@ -125,7 +129,7 @@ namespace TLAC::Components
}
// always exit pause if key is tapped or no longer in game somehow
if (isPauseKeyTapped() || *(GameState*)CURRENT_GAME_STATE_ADDRESS != GS_GAME || *(SubGameState*)CURRENT_GAME_SUB_STATE_ADDRESS != SUB_GAME_MAIN)
if (isPauseKeyTapped() || !isInGame())
{
pause = false;
}
@@ -221,7 +225,7 @@ namespace TLAC::Components
filteredButtons = (JvsButtons)(filteredButtons & ~inputState->Tapped.Buttons);
// only enter pause if in game
if (*(GameState*)CURRENT_GAME_STATE_ADDRESS == GS_GAME && *(SubGameState*)CURRENT_GAME_SUB_STATE_ADDRESS == SUB_GAME_MAIN)
if (isInGame())
{
if (isPauseKeyTapped())
{
@@ -357,11 +361,22 @@ namespace TLAC::Components
}
}
void Pause::OnFocusLost()
{
if (isInGame())
pause = true;
}
bool Pause::isPauseKeyTapped()
{
return inputState->Tapped.Buttons & JVS_START;
}
bool Pause::isInGame()
{
return *(GameState*)CURRENT_GAME_STATE_ADDRESS == GS_GAME && *(SubGameState*)CURRENT_GAME_SUB_STATE_ADDRESS == SUB_GAME_MAIN;
}
bool Pause::hookedGiveUpFunc(void* cls)
{
if (giveUp)
source-code/source/plugins/TLAC/Components/Pause.h
+6 -4
View File
@@ -22,12 +22,14 @@ namespace TLAC::Components
virtual void Update() override;
virtual void UpdatePostInput() override;
virtual void UpdateDraw2D() override;
virtual void OnFocusLost() override;
static bool pause; // set pause to change pause state
static bool giveUp; // set give up to end current song
private:
// this is a mess of static so that menuItems can work
static bool isPauseKeyTapped();
static bool isInGame();
static std::vector<bool> streamPlayStates;
static void InjectCode(void* address, const std::vector<uint8_t> data);
@@ -62,10 +64,10 @@ namespace TLAC::Components
static bool showUI;
int triangleAet;
int squareAet;
int crossAet;
int circleAet;
static int triangleAet;
static int squareAet;
static int crossAet;
static int circleAet;
enum menusets
{