mirror of
https://github.com/OpenMW/openmw.git
synced 2025-12-02 08:04:30 +00:00
Don't play down sound while loading quick keys
This commit is contained in:
parent
b53cb085c9
commit
682f00bcff
2 changed files with 7 additions and 2 deletions
|
|
@ -228,7 +228,7 @@ namespace MWGui
|
||||||
mAssignDialog->setVisible(false);
|
mAssignDialog->setVisible(false);
|
||||||
}
|
}
|
||||||
|
|
||||||
void QuickKeysMenu::onAssignItem(MWWorld::Ptr item)
|
void QuickKeysMenu::assignItem(MWWorld::Ptr item)
|
||||||
{
|
{
|
||||||
assert(mSelected);
|
assert(mSelected);
|
||||||
|
|
||||||
|
|
@ -245,7 +245,11 @@ namespace MWGui
|
||||||
|
|
||||||
if (mItemSelectionDialog)
|
if (mItemSelectionDialog)
|
||||||
mItemSelectionDialog->setVisible(false);
|
mItemSelectionDialog->setVisible(false);
|
||||||
|
}
|
||||||
|
|
||||||
|
void QuickKeysMenu::onAssignItem(MWWorld::Ptr item)
|
||||||
|
{
|
||||||
|
assignItem(item);
|
||||||
MWBase::Environment::get().getWindowManager()->playSound(item.getClass().getDownSoundId(item));
|
MWBase::Environment::get().getWindowManager()->playSound(item.getClass().getDownSoundId(item));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -566,7 +570,7 @@ namespace MWGui
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
if (quickKey.mType == ESM::QuickKeys::Type::Item)
|
if (quickKey.mType == ESM::QuickKeys::Type::Item)
|
||||||
onAssignItem(item);
|
assignItem(item);
|
||||||
else // if (quickKey.mType == ESM::QuickKeys::Type::MagicItem)
|
else // if (quickKey.mType == ESM::QuickKeys::Type::MagicItem)
|
||||||
onAssignMagicItem(item);
|
onAssignMagicItem(item);
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -72,6 +72,7 @@ namespace MWGui
|
||||||
// Check if quick key is still valid
|
// Check if quick key is still valid
|
||||||
inline void validate(int index);
|
inline void validate(int index);
|
||||||
void unassign(keyData* key);
|
void unassign(keyData* key);
|
||||||
|
void assignItem(MWWorld::Ptr item);
|
||||||
};
|
};
|
||||||
|
|
||||||
class QuickKeysMenuAssign : public WindowModal
|
class QuickKeysMenuAssign : public WindowModal
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue