diff options
| author | Andrei Karas <akaras@inbox.ru> | 2015-11-12 18:52:13 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2015-11-12 18:52:13 +0300 |
| commit | 388f348acf3aeb954dae3160efeb6a8cd5fe6e4a (patch) | |
| tree | c4c5b9af46c5921682f7aa45b75350be87955a19 /src/gui/windows/ministatuswindow.cpp | |
| parent | e082aa3439e3ffb4b69c491be1dc881e9c14abce (diff) | |
| download | manaverse-388f348acf3aeb954dae3160efeb6a8cd5fe6e4a.tar.gz manaverse-388f348acf3aeb954dae3160efeb6a8cd5fe6e4a.tar.bz2 manaverse-388f348acf3aeb954dae3160efeb6a8cd5fe6e4a.tar.xz manaverse-388f348acf3aeb954dae3160efeb6a8cd5fe6e4a.zip | |
Remove manaserv related flag for use mana bar.
Diffstat (limited to 'src/gui/windows/ministatuswindow.cpp')
| -rw-r--r-- | src/gui/windows/ministatuswindow.cpp | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/src/gui/windows/ministatuswindow.cpp b/src/gui/windows/ministatuswindow.cpp index 6098f59cf..09754420f 100644 --- a/src/gui/windows/ministatuswindow.cpp +++ b/src/gui/windows/ministatuswindow.cpp @@ -69,8 +69,7 @@ MiniStatusWindow::MiniStatusWindow() : mHpBar(createBar(0, 100, 0, ThemeColorId::HP_BAR, ProgressColorId::PROG_HP, "hpprogressbar.xml", "hpprogressbar_fill.xml", "hp bar", _("health bar"))), - mMpBar(gameHandler->canUseMagicBar() - ? createBar(0, 100, 0, playerHandler->canUseMagic() + mMpBar(createBar(0, 100, 0, playerHandler->canUseMagic() ? ThemeColorId::MP_BAR : ThemeColorId::NO_MP_BAR, playerHandler->canUseMagic() ? ProgressColorId::PROG_MP : ProgressColorId::PROG_NO_MP, @@ -79,7 +78,7 @@ MiniStatusWindow::MiniStatusWindow() : playerHandler->canUseMagic() ? "mpprogressbar_fill.xml" : "nompprogressbar_fill.xml", // TRANSLATORS: status bar name - "mp bar", _("mana bar")) : nullptr), + "mp bar", _("mana bar"))), mXpBar(createBar(0, 100, 0, ThemeColorId::XP_BAR, ProgressColorId::PROG_EXP, "xpprogressbar.xml", "xpprogressbar_fill.xml", // TRANSLATORS: status bar name @@ -120,7 +119,7 @@ MiniStatusWindow::MiniStatusWindow() : { StatusWindow::updateHPBar(mHpBar); - if (gameHandler->canUseMagicBar() && statusWindow) + if (statusWindow) statusWindow->updateMPBar(mMpBar); const bool job = serverConfig.getValueBool("showJob", true); |