diff --git a/apps/openmw/mwvr/openxractionset.cpp b/apps/openmw/mwvr/openxractionset.cpp index 43f6b3d71..e2a0f3cb9 100644 --- a/apps/openmw/mwvr/openxractionset.cpp +++ b/apps/openmw/mwvr/openxractionset.cpp @@ -73,7 +73,7 @@ namespace MWVR createMWAction(MWInput::A_CycleWeaponLeft, "cycle_weapon_left", "Cycle Weapon Left"); createMWAction(MWInput::A_CycleWeaponRight, "cycle_weapon_right", "Cycle Weapon Right"); createMWAction(MWInput::A_Sneak, "sneak", "Sneak"); - createMWAction(MWInput::A_QuickMenu, "quick_menu", "Quick Menu"); + createMWAction(MWInput::A_QuickKeysMenu, "quick_menu", "Quick Menu"); createMWAction(MWInput::A_LookLeftRight, "look_left_right", "Look Left Right"); createMWAction(MWInput::A_MoveForwardBackward, "move_forward_backward", "Move Forward Backward"); createMWAction(MWInput::A_MoveLeftRight, "move_left_right", "Move Left Right"); diff --git a/apps/openmw/mwvr/vrmetamenu.cpp b/apps/openmw/mwvr/vrmetamenu.cpp index 225041142..b5ed32087 100644 --- a/apps/openmw/mwvr/vrmetamenu.cpp +++ b/apps/openmw/mwvr/vrmetamenu.cpp @@ -77,6 +77,11 @@ namespace MWVR MWBase::Environment::get().getWindowManager()->pushGuiMode(MWGui::GM_Rest); //Open rest GUI } + void VrMetaMenu::onQuickMenu() + { + MWBase::Environment::get().getWindowManager()->pushGuiMode(MWGui::GM_QuickKeysMenu); + } + void VrMetaMenu::onQuickLoad() { if (!MyGUI::InputManager::getInstance().isModalAny()) @@ -108,6 +113,8 @@ namespace MWVR onInventory(); else if (name == "rest") onRest(); + else if (name == "quickmenu") + onQuickMenu(); else if (name == "quickload") onQuickLoad(); else if (name == "quicksave") @@ -121,7 +128,7 @@ namespace MWVR void VrMetaMenu::updateMenu() { - static std::vector buttons{ "return", "quicksave", "quickload", "console", "inventory", "journal", "rest", "gamemenu" }; + static std::vector buttons{ "return", "quicksave", "quickload", "console", "inventory", "journal", "rest", "quickmenu", "gamemenu" }; if(mButtons.empty()) for (std::string& buttonId : buttons) diff --git a/apps/openmw/mwvr/vrmetamenu.hpp b/apps/openmw/mwvr/vrmetamenu.hpp index 3297d2696..723026103 100644 --- a/apps/openmw/mwvr/vrmetamenu.hpp +++ b/apps/openmw/mwvr/vrmetamenu.hpp @@ -47,6 +47,7 @@ namespace MWVR void onGameMenu(); void onInventory(); void onRest(); + void onQuickMenu(); void onQuickLoad(); void onQuickSave(); void close(); diff --git a/files/mygui/openmw_vr_metamenu.layout b/files/mygui/openmw_vr_metamenu.layout index f797edc93..b0cafc635 100644 --- a/files/mygui/openmw_vr_metamenu.layout +++ b/files/mygui/openmw_vr_metamenu.layout @@ -45,6 +45,10 @@ + + + +