Leahnaya/JKSV
1
0
Fork 0
mirror of https://github.com/J-D-K/JKSV.git synced 2026-09-12 12:35:26 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Add StateManager singleton.

Browse Source
This commit is contained in:
J-D-K
2025-06-21 08:09:07 -04:00
parent 53c9a4633f
commit 4a6d365860
12 changed files with 196 additions and 101 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
source/appstates/MainMenuState.cpp
View File

@@ -1,5 +1,5 @@
#include "appstates/MainMenuState.hpp"
#include "JKSV.hpp"
#include "StateManager.hpp"
#include "appstates/ExtrasMenuState.hpp"
#include "appstates/SettingsState.hpp"
#include "appstates/TextTitleSelectState.hpp"
@@ -53,16 +53,17 @@ void MainMenuState::update(void)
int selected = m_mainMenu.get_selected();
// To do: Simplify this logic.
if (input::button_pressed(HidNpadButton_A) && selected < static_cast<int>(sm_users.size()) &&
sm_users.at(selected)->get_total_data_entries() > 0)
{
sm_states.at(selected)->reactivate();
JKSV::push_state(sm_states.at(selected));
StateManager::push_state(sm_states.at(selected));
}
else if (input::button_pressed(HidNpadButton_A) && selected >= static_cast<int>(sm_users.size()))
{
sm_states.at(selected)->reactivate();
JKSV::push_state(sm_states.at(selected));
StateManager::push_state(sm_states.at(selected));
}
else if (input::button_pressed(HidNpadButton_X) && selected < static_cast<int>(sm_users.size()))
{
@@ -70,7 +71,7 @@ void MainMenuState::update(void)
data::User *targetUser = sm_users.at(selected);
TitleSelectCommon *targetTitleSelect = reinterpret_cast<TitleSelectCommon *>(sm_states.at(selected).get());
JKSV::push_state(std::make_shared<UserOptionState>(targetUser, targetTitleSelect));
StateManager::push_state(std::make_shared<UserOptionState>(targetUser, targetTitleSelect));
}
}