diff --git a/gta2-seuko-mod.vcxproj b/gta2-seuko-mod.vcxproj index 70cb1b8..4ef4187 100644 --- a/gta2-seuko-mod.vcxproj +++ b/gta2-seuko-mod.vcxproj @@ -446,6 +446,7 @@ + @@ -741,6 +742,7 @@ + diff --git a/gta2-seuko-mod.vcxproj.filters b/gta2-seuko-mod.vcxproj.filters index fb87ec5..01dd3cc 100644 --- a/gta2-seuko-mod.vcxproj.filters +++ b/gta2-seuko-mod.vcxproj.filters @@ -228,6 +228,7 @@ + @@ -590,6 +591,7 @@ + diff --git a/src/modules/modmenu/menus/menus.h b/src/modules/modmenu/menus/menus.h index 64eeb24..f12b6ae 100644 --- a/src/modules/modmenu/menus/menus.h +++ b/src/modules/modmenu/menus/menus.h @@ -32,6 +32,7 @@ #include "quick-actions-menu.h" #include "add-quick-action-menu.h" #include "quick-action-options-menu.h" +#include "seukomod-options-menu.h" #include "menu-controls-menu.h" #include "version-menu.h" #include "mouse-debug-menu.h" diff --git a/src/modules/modmenu/menus/misc-menu.cpp b/src/modules/modmenu/menus/misc-menu.cpp index 8be148a..34fe5e7 100644 --- a/src/modules/modmenu/menus/misc-menu.cpp +++ b/src/modules/modmenu/menus/misc-menu.cpp @@ -1,8 +1,7 @@ #include "misc-menu.h" #include "../root.h" -#include "menu-controls-menu.h" #include "quick-actions-menu.h" -#include "version-menu.h" +#include "seukomod-options-menu.h" #include "../utils/save-game.h" #include "../utils/unlock-all-levels.h" #include "../toast-manager.h" @@ -25,9 +24,8 @@ bool ModMenuModule::MiscMenu::Attach() const auto& options = ModMenuModule::RootModule::GetInstance()->GetOptions(); m_menuController->CreateItem(vertCont, L"Go back", options.textSize); - m_menuController->CreateItem(vertCont, L"Menu controls", options.textSize); m_menuController->CreateItem(vertCont, L"Quick actions", options.textSize); - m_menuController->CreateItem(vertCont, L"Version details", options.textSize); + m_menuController->CreateItem(vertCont, L"Seuko mod options", options.textSize); // quick save button auto quickSaveText = m_menuController->CreateItem(vertCont, L"Quick save", options.textSize); @@ -50,14 +48,11 @@ void ModMenuModule::MiscMenu::OnMenuAction(UiModule::Selectable* item, UiModule: case 0: // Go back ModMenuModule::MenuManager::GetInstance()->RemoveLastMenu(); break; - case 1: // Menu controls - ModMenuModule::MenuManager::GetInstance()->AddMenu(); - break; - case 2: // Quick actions + case 1: // Quick actions ModMenuModule::MenuManager::GetInstance()->AddMenu(); break; - case 3: // Version info - ModMenuModule::MenuManager::GetInstance()->AddMenu(); + case 2: // Seuko mod options + ModMenuModule::MenuManager::GetInstance()->AddMenu(); break; default: break; diff --git a/src/modules/modmenu/menus/seukomod-options-menu.cpp b/src/modules/modmenu/menus/seukomod-options-menu.cpp new file mode 100644 index 0000000..a38f778 --- /dev/null +++ b/src/modules/modmenu/menus/seukomod-options-menu.cpp @@ -0,0 +1,47 @@ +#include "seukomod-options-menu.h" +#include "../root.h" +#include "menu-controls-menu.h" +#include "version-menu.h" + +ModMenuModule::SeukomodOptionsMenu::SeukomodOptionsMenu() +{ + +} + +ModMenuModule::SeukomodOptionsMenu::~SeukomodOptionsMenu() +{ + +} + +bool ModMenuModule::SeukomodOptionsMenu::Attach() +{ + UiModule::Component* vertCont; + CreateMenu(L"#Seuko mod options#", vertCont); + UiModule::RootModule* uiRoot = UiModule::RootModule::GetInstance(); + const auto& options = ModMenuModule::RootModule::GetInstance()->GetOptions(); + + m_menuController->CreateItem(vertCont, L"Go back", options.textSize); + m_menuController->CreateItem(vertCont, L"Menu controls", options.textSize); + m_menuController->CreateItem(vertCont, L"Version details", options.textSize); + + SetPreviousSelectedIndex(); + + return true; +} + +void ModMenuModule::SeukomodOptionsMenu::OnMenuAction(UiModule::Selectable* item, UiModule::MenuItemId id) +{ + switch (id) { + case 0: // Go back + ModMenuModule::MenuManager::GetInstance()->RemoveLastMenu(); + break; + case 1: // Menu controls + ModMenuModule::MenuManager::GetInstance()->AddMenu(); + break; + case 2: // Version info + ModMenuModule::MenuManager::GetInstance()->AddMenu(); + break; + default: + break; + } +} diff --git a/src/modules/modmenu/menus/seukomod-options-menu.h b/src/modules/modmenu/menus/seukomod-options-menu.h new file mode 100644 index 0000000..138b729 --- /dev/null +++ b/src/modules/modmenu/menus/seukomod-options-menu.h @@ -0,0 +1,16 @@ +#pragma once +#include "../common.h" +#include "../menu-base.h" + +namespace ModMenuModule { + class SeukomodOptionsMenu : public MenuBase { + public: + SeukomodOptionsMenu(); + virtual ~SeukomodOptionsMenu(); + + private: + virtual bool Attach() override; + + void OnMenuAction(UiModule::Selectable* item, UiModule::MenuItemId id) override; + }; +}