forked from mirror/openmw-tes3mp
Fix a crash after loading game
This commit is contained in:
parent
42b332775a
commit
5b011e43a7
3 changed files with 12 additions and 1 deletions
|
@ -52,7 +52,7 @@ namespace MWGui
|
||||||
, mWeaponVisible(true)
|
, mWeaponVisible(true)
|
||||||
, mSpellVisible(true)
|
, mSpellVisible(true)
|
||||||
, mWorldMouseOver(false)
|
, mWorldMouseOver(false)
|
||||||
, mEnemyHealthTimer(0)
|
, mEnemyHealthTimer(-1)
|
||||||
, mIsDrowning(false)
|
, mIsDrowning(false)
|
||||||
, mWeaponSpellTimer(0.f)
|
, mWeaponSpellTimer(0.f)
|
||||||
, mDrowningFlashTheta(0.f)
|
, mDrowningFlashTheta(0.f)
|
||||||
|
@ -639,4 +639,10 @@ namespace MWGui
|
||||||
updateEnemyHealthBar();
|
updateEnemyHealthBar();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
void HUD::resetEnemy()
|
||||||
|
{
|
||||||
|
mEnemy = MWWorld::Ptr();
|
||||||
|
mEnemyHealthTimer = -1;
|
||||||
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
|
@ -56,6 +56,7 @@ namespace MWGui
|
||||||
void update();
|
void update();
|
||||||
|
|
||||||
void setEnemy(const MWWorld::Ptr& enemy);
|
void setEnemy(const MWWorld::Ptr& enemy);
|
||||||
|
void resetEnemy();
|
||||||
|
|
||||||
private:
|
private:
|
||||||
MyGUI::ProgressBar *mHealth, *mMagicka, *mStamina, *mEnemyHealth, *mDrowning;
|
MyGUI::ProgressBar *mHealth, *mMagicka, *mStamina, *mEnemyHealth, *mDrowning;
|
||||||
|
|
|
@ -289,6 +289,10 @@ namespace MWGui
|
||||||
|
|
||||||
void WindowManager::setNewGame(bool newgame)
|
void WindowManager::setNewGame(bool newgame)
|
||||||
{
|
{
|
||||||
|
// This method will always be called after loading a savegame or starting a new game
|
||||||
|
// Reset enemy, it could be a dangling pointer from a previous game
|
||||||
|
mHud->resetEnemy();
|
||||||
|
|
||||||
if (newgame)
|
if (newgame)
|
||||||
{
|
{
|
||||||
disallowAll();
|
disallowAll();
|
||||||
|
|
Loading…
Reference in a new issue