Merge branch 'fix_hud' into 'master'

Fix HUD cleanup from main menu See merge request OpenMW/openmw!3596
OpenMW · Nov 25, 2023 · 881f41c · 881f41c
2 parents 22dbb3e + 9993902
commit 881f41c
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 8 deletions.
diff --git a/apps/openmw/mwgui/hud.cpp b/apps/openmw/mwgui/hud.cpp
@@ -421,6 +421,7 @@ namespace MWGui
 
         mSpellBox->setUserString("ToolTipType", "Spell");
         mSpellBox->setUserString("Spell", spellId.serialize());
+        mSpellBox->setUserData(MyGUI::Any::Null);
 
         // use the icon of the first effect
         const ESM::MagicEffect* effect = MWBase::Environment::get().getESMStore()->get<ESM::MagicEffect>().find(
@@ -491,6 +492,7 @@ namespace MWGui
         mSpellStatus->setProgressPosition(0);
         mSpellImage->setItem(MWWorld::Ptr());
         mSpellBox->clearUserStrings();
+        mSpellBox->setUserData(MyGUI::Any::Null);
     }
 
     void HUD::unsetSelectedWeapon()
@@ -520,6 +522,7 @@ namespace MWGui
         mWeapBox->setUserString("ToolTipLayout", "HandToHandToolTip");
         mWeapBox->setUserString("Caption_HandToHandText", itemName);
         mWeapBox->setUserString("ImageTexture_HandToHandImage", icon);
+        mWeapBox->setUserData(MyGUI::Any::Null);
     }
 
     void HUD::setCrosshairVisible(bool visible)
@@ -650,17 +653,28 @@ namespace MWGui
         updateEnemyHealthBar();
     }
 
-    void HUD::resetEnemy()
+    void HUD::clear()
     {
         mEnemyActorId = -1;
         mEnemyHealthTimer = -1;
-    }
 
-    void HUD::clear()
-    {
-        unsetSelectedSpell();
-        unsetSelectedWeapon();
-        resetEnemy();
+        mWeaponSpellTimer = 0.f;
+        mWeaponName = std::string();
+        mSpellName = std::string();
+        mWeaponSpellBox->setVisible(false);
+
+        mWeapStatus->setProgressRange(100);
+        mWeapStatus->setProgressPosition(0);
+        mSpellStatus->setProgressRange(100);
+        mSpellStatus->setProgressPosition(0);
+
+        mWeapImage->setItem(MWWorld::Ptr());
+        mSpellImage->setItem(MWWorld::Ptr());
+
+        mWeapBox->clearUserStrings();
+        mWeapBox->setUserData(MyGUI::Any::Null);
+        mSpellBox->clearUserStrings();
+        mSpellBox->setUserData(MyGUI::Any::Null);
     }
 
     void HUD::customMarkerCreated(MyGUI::Widget* marker)

diff --git a/apps/openmw/mwgui/hud.hpp b/apps/openmw/mwgui/hud.hpp
@@ -58,7 +58,6 @@ namespace MWGui
         MyGUI::Widget* getEffectBox() { return mEffectBox; }
 
         void setEnemy(const MWWorld::Ptr& enemy);
-        void resetEnemy();
 
         void clear() override;