mirror of
https://gitlab.com/OpenMW/openmw.git
synced 2025-03-17 10:21:11 +00:00
Allow activating quick keys menu in menus
This commit is contained in:
parent
b7763fad2d
commit
80a2ef29ad
@ -133,6 +133,7 @@
|
|||||||
Bug #6799: Game crashes if an NPC has no Class attached
|
Bug #6799: Game crashes if an NPC has no Class attached
|
||||||
Bug #6849: ImageButton texture is not scaled properly
|
Bug #6849: ImageButton texture is not scaled properly
|
||||||
Bug #6895: Removing a negative number of items from a script, makes the script terminate with an error
|
Bug #6895: Removing a negative number of items from a script, makes the script terminate with an error
|
||||||
|
Bug #6898: Accessing the Quick Inventory menu does not work while in menu mode
|
||||||
Bug #6901: Morrowind.exe soul gem usage discrepancy
|
Bug #6901: Morrowind.exe soul gem usage discrepancy
|
||||||
Feature #890: OpenMW-CS: Column filtering
|
Feature #890: OpenMW-CS: Column filtering
|
||||||
Feature #1465: "Reset" argument for AI functions
|
Feature #1465: "Reset" argument for AI functions
|
||||||
|
@ -477,22 +477,25 @@ namespace MWInput
|
|||||||
|
|
||||||
void ActionManager::showQuickKeysMenu()
|
void ActionManager::showQuickKeysMenu()
|
||||||
{
|
{
|
||||||
if (!MWBase::Environment::get().getWindowManager()->isGuiMode ()
|
if (MWBase::Environment::get().getWindowManager()->getMode () == MWGui::GM_QuickKeysMenu)
|
||||||
&& MWBase::Environment::get().getWorld()->getGlobalFloat ("chargenstate")==-1)
|
|
||||||
{
|
|
||||||
if (!checkAllowedToUseItems())
|
|
||||||
return;
|
|
||||||
|
|
||||||
MWBase::Environment::get().getWindowManager()->pushGuiMode (MWGui::GM_QuickKeysMenu);
|
|
||||||
}
|
|
||||||
else if (MWBase::Environment::get().getWindowManager()->getMode () == MWGui::GM_QuickKeysMenu)
|
|
||||||
{
|
{
|
||||||
|
//Handle any open Modal windows
|
||||||
while (MyGUI::InputManager::getInstance().isModalAny())
|
while (MyGUI::InputManager::getInstance().isModalAny())
|
||||||
{ //Handle any open Modal windows
|
{
|
||||||
MWBase::Environment::get().getWindowManager()->exitCurrentModal();
|
MWBase::Environment::get().getWindowManager()->exitCurrentModal();
|
||||||
}
|
}
|
||||||
MWBase::Environment::get().getWindowManager()->exitCurrentGuiMode(); //And handle the actual main window
|
//And handle the actual main window
|
||||||
|
MWBase::Environment::get().getWindowManager()->exitCurrentGuiMode();
|
||||||
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (MWBase::Environment::get().getWorld()->getGlobalFloat ("chargenstate") != -1)
|
||||||
|
return;
|
||||||
|
|
||||||
|
if (!checkAllowedToUseItems())
|
||||||
|
return;
|
||||||
|
|
||||||
|
MWBase::Environment::get().getWindowManager()->pushGuiMode (MWGui::GM_QuickKeysMenu);
|
||||||
}
|
}
|
||||||
|
|
||||||
void ActionManager::activate()
|
void ActionManager::activate()
|
||||||
|
Loading…
x
Reference in New Issue
Block a user