mirror of
https://github.com/J-D-K/JKSV.git
synced 2026-09-12 12:35:26 -05:00
Change AppState to BaseState. Update headers.
This commit is contained in:
@@ -64,7 +64,9 @@ SettingsState::SettingsState()
|
||||
|
||||
void SettingsState::update()
|
||||
{
|
||||
m_settingsMenu.update(AppState::has_focus());
|
||||
const bool hasFocus = BaseState::has_focus();
|
||||
|
||||
m_settingsMenu.update(hasFocus);
|
||||
|
||||
if (input::button_pressed(HidNpadButton_A))
|
||||
{
|
||||
@@ -72,17 +74,19 @@ void SettingsState::update()
|
||||
}
|
||||
else if (input::button_pressed(HidNpadButton_B))
|
||||
{
|
||||
AppState::deactivate();
|
||||
BaseState::deactivate();
|
||||
}
|
||||
}
|
||||
|
||||
void SettingsState::render()
|
||||
{
|
||||
const bool hasFocus = BaseState::has_focus();
|
||||
|
||||
m_renderTarget->clear(colors::TRANSPARENT);
|
||||
m_settingsMenu.render(m_renderTarget->get(), AppState::has_focus());
|
||||
m_settingsMenu.render(m_renderTarget->get(), hasFocus);
|
||||
m_renderTarget->render(NULL, 201, 91);
|
||||
|
||||
if (AppState::has_focus())
|
||||
if (hasFocus)
|
||||
{
|
||||
sdl::text::render(NULL,
|
||||
m_controlGuideX,
|
||||
|
||||
Reference in New Issue
Block a user