krageon/openmw-tes3coop
1
0
Fork 0
forked from teamnwah/openmw-tes3coop
Code Issues Pull requests Releases Wiki Activity

Extend HUD::clear()

Browse source
This commit is contained in:
scrawl 2017-09-23 23:09:41 +02:00
parent f6c227b966
commit 222defc6d8
3 changed files with 10 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
apps/openmw/mwgui/hud.cpp
View file

@ -632,6 +632,13 @@ namespace MWGui
mEnemyHealthTimer = -1; mEnemyHealthTimer = -1;
} }
void HUD::clear()
{
unsetSelectedSpell();
unsetSelectedWeapon();
resetEnemy();
}
void HUD::customMarkerCreated(MyGUI::Widget *marker) void HUD::customMarkerCreated(MyGUI::Widget *marker)
{ {
marker->eventMouseButtonClick += MyGUI::newDelegate(this, &HUD::onMapClicked); marker->eventMouseButtonClick += MyGUI::newDelegate(this, &HUD::onMapClicked);

2
apps/openmw/mwgui/hud.hpp
View file

@ -58,7 +58,7 @@ namespace MWGui
void setEnemy(const MWWorld::Ptr& enemy); void setEnemy(const MWWorld::Ptr& enemy);
void resetEnemy(); void resetEnemy();
void clear() { resetEnemy(); } void clear();
private: private:
MyGUI::ProgressBar *mHealth, *mMagicka, *mStamina, *mEnemyHealth, *mDrowning; MyGUI::ProgressBar *mHealth, *mMagicka, *mStamina, *mEnemyHealth, *mDrowning;

9
apps/openmw/mwgui/windowmanagerimp.cpp
View file

@ -506,16 +506,9 @@ namespace MWGui
disallowAll(); disallowAll();
delete mCharGen; delete mCharGen;
mCharGen = new CharacterCreation(mViewer->getSceneData()->asGroup(), mResourceSystem); mCharGen = new CharacterCreation(mViewer->getSceneData()->asGroup(), mResourceSystem);
mGuiModes.clear();
MWBase::Environment::get().getInputManager()->changeInputMode(false);
mHud->unsetSelectedWeapon();
mHud->unsetSelectedSpell();
unsetForceHide(GW_ALL);
} }
else else
allow(GW_ALL); allow(GW_ALL);
mRestAllowed = !newgame;
} }
WindowManager::~WindowManager() WindowManager::~WindowManager()
@ -1338,6 +1331,7 @@ namespace MWGui
void WindowManager::disallowAll() void WindowManager::disallowAll()
{ {
mAllowed = GW_None; mAllowed = GW_None;
mRestAllowed = false;
mBookWindow->setInventoryAllowed (false); mBookWindow->setInventoryAllowed (false);
mScrollWindow->setInventoryAllowed (false); mScrollWindow->setInventoryAllowed (false);
@ -1588,6 +1582,7 @@ namespace MWGui
mCustomMarkers.clear(); mCustomMarkers.clear();
mForceHidden = GW_None; mForceHidden = GW_None;
mRestAllowed = true;
while (!mGuiModes.empty()) while (!mGuiModes.empty())
popGuiMode(); popGuiMode();