Added the quick keys menu to the meta menu and added the option to assign it to your controller if you wish.

pull/615/head
Mads Buvik Sandvei 4 years ago
parent c46c20dec2
commit 3008062955

@ -73,7 +73,7 @@ namespace MWVR
createMWAction<ButtonPressAction>(MWInput::A_CycleWeaponLeft, "cycle_weapon_left", "Cycle Weapon Left");
createMWAction<ButtonPressAction>(MWInput::A_CycleWeaponRight, "cycle_weapon_right", "Cycle Weapon Right");
createMWAction<ButtonHoldAction>(MWInput::A_Sneak, "sneak", "Sneak");
createMWAction<ButtonPressAction>(MWInput::A_QuickMenu, "quick_menu", "Quick Menu");
createMWAction<ButtonPressAction>(MWInput::A_QuickKeysMenu, "quick_menu", "Quick Menu");
createMWAction<AxisAction>(MWInput::A_LookLeftRight, "look_left_right", "Look Left Right");
createMWAction<AxisAction>(MWInput::A_MoveForwardBackward, "move_forward_backward", "Move Forward Backward");
createMWAction<AxisAction>(MWInput::A_MoveLeftRight, "move_left_right", "Move Left Right");

@ -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<std::string> buttons{ "return", "quicksave", "quickload", "console", "inventory", "journal", "rest", "gamemenu" };
static std::vector<std::string> buttons{ "return", "quicksave", "quickload", "console", "inventory", "journal", "rest", "quickmenu", "gamemenu" };
if(mButtons.empty())
for (std::string& buttonId : buttons)

@ -47,6 +47,7 @@ namespace MWVR
void onGameMenu();
void onInventory();
void onRest();
void onQuickMenu();
void onQuickLoad();
void onQuickSave();
void close();

@ -45,6 +45,10 @@
<Property key="Caption" value="Rest"/>
<Property key="FontHeight" value="32"/>
</Widget>
<Widget type="AutoSizedButton" skin="MW_Button" name="quickmenu" align="HCenter">
<Property key="Caption" value="Quick Menu"/>
<Property key="FontHeight" value="32"/>
</Widget>
<Widget type="Spacer"/>
<Widget type="Widget" skin="IB_T" align="HCenter" position="0 0 125 4">

Loading…
Cancel
Save