Grey out magic bar if matk negative, update F2 window magic bar

2 files changed, 6 insertions, 1 deletions

diff --git a/src/gui/ministatus.cpp b/src/gui/ministatus.cpp
index 077e2331..388b5fbf 100644
--- a/src/gui/ministatus.cpp
+++ b/src/gui/ministatus.cpp
@@ -99,6 +99,11 @@ void MiniStatusWindow::update()
 
     mHpBar->setProgress((float) player_node->mHp / player_node->mMaxHp);
     mMpBar->setProgress((float) player_node->mMp / player_node->mMaxMp);
+    if (player_node->MATK <= 0)
+        mMpBar->setColor(100, 100, 100); // grey, to indicate that we lack magic
+    else
+        mMpBar->setColor(143, 192, 211); // blue, to indicate that we have magic
+
     mXpBar->setProgress(
             (float) player_node->getXp() / player_node->mXpForNextLevel);
 
diff --git a/src/gui/status.cpp b/src/gui/status.cpp
index 927b3554..eebd0a21 100644
--- a/src/gui/status.cpp
+++ b/src/gui/status.cpp
@@ -265,7 +265,7 @@ void StatusWindow::update()
     }
 
     mHpBar->setProgress((float) mPlayer->mHp / (float) mPlayer->mMaxHp);
-    // mMpBar->setProgress((float)mPlayer->mp / (float)mPlayer->maxMp);
+    mMpBar->setProgress((float) mPlayer->mMp / (float) mPlayer->mMaxMp);
 
     mXpBar->setProgress(
             (float) mPlayer->getXp() / (float) mPlayer->mXpForNextLevel);