mirror/openmw-tes3mp
1
0
Fork 1
mirror of https://github.com/TES3MP/openmw-tes3mp.git synced 2025-01-20 06:23:52 +00:00
Code Issues Releases Wiki Activity

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

Browse source
This commit is contained in:
Mads Buvik Sandvei 2020-12-04 22:41:49 +01:00
parent c46c20dec2
commit 3008062955
4 changed files with 14 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
apps/openmw/mwvr/openxractionset.cpp
View file

@ -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");

9
apps/openmw/mwvr/vrmetamenu.cpp
View file

@ -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)

1
apps/openmw/mwvr/vrmetamenu.hpp
View file

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

4
files/mygui/openmw_vr_metamenu.layout
View file

@ -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">