diff options
author | Andrei Karas <akaras@inbox.ru> | 2014-07-25 22:03:28 +0300 |
---|---|---|
committer | Andrei Karas <akaras@inbox.ru> | 2014-07-25 22:03:28 +0300 |
commit | d670395fff93f805b666e0cc4cc56cdb880e0bba (patch) | |
tree | e7949649a7c0568b3b238c91092f60606a495f9f /src/gui/windows/statuswindow.cpp | |
parent | 7d6d3d997614e8e76ca9044ca8ed5a81d3b14a95 (diff) | |
download | mv-d670395fff93f805b666e0cc4cc56cdb880e0bba.tar.gz mv-d670395fff93f805b666e0cc4cc56cdb880e0bba.tar.bz2 mv-d670395fff93f805b666e0cc4cc56cdb880e0bba.tar.xz mv-d670395fff93f805b666e0cc4cc56cdb880e0bba.zip |
Use all methods in gamemodifiers as static.
Diffstat (limited to 'src/gui/windows/statuswindow.cpp')
-rw-r--r-- | src/gui/windows/statuswindow.cpp | 31 |
1 files changed, 14 insertions, 17 deletions
diff --git a/src/gui/windows/statuswindow.cpp b/src/gui/windows/statuswindow.cpp index adde623bb..c5f2b29d3 100644 --- a/src/gui/windows/statuswindow.cpp +++ b/src/gui/windows/statuswindow.cpp @@ -640,27 +640,24 @@ std::string StatusWindow::translateLetter2(const std::string &letters) void StatusWindow::updateStatusBar(ProgressBar *const bar, const bool percent A_UNUSED) const { - if (!modifiers) - return; - - bar->setText(translateLetter2(modifiers->getMoveTypeString()) - .append(translateLetter2(modifiers->getCrazyMoveTypeString())) - .append(translateLetter2(modifiers->getMoveToTargetTypeString())) - .append(translateLetter2(modifiers->getFollowModeString())) + bar->setText(translateLetter2(GameModifiers::getMoveTypeString()) + .append(translateLetter2(GameModifiers::getCrazyMoveTypeString())) + .append(translateLetter2(GameModifiers::getMoveToTargetTypeString())) + .append(translateLetter2(GameModifiers::getFollowModeString())) .append(" ").append(translateLetter2( - modifiers->getAttackWeaponTypeString())) - .append(translateLetter2(modifiers->getAttackTypeString())) - .append(translateLetter2(modifiers->getMagicAttackTypeString())) - .append(translateLetter2(modifiers->getPvpAttackTypeString())) + GameModifiers::getAttackWeaponTypeString())) + .append(translateLetter2(GameModifiers::getAttackTypeString())) + .append(translateLetter2(GameModifiers::getMagicAttackTypeString())) + .append(translateLetter2(GameModifiers::getPvpAttackTypeString())) .append(" ").append(translateLetter2( - modifiers->getQuickDropCounterString())) - .append(translateLetter2(modifiers->getPickUpTypeString())) + GameModifiers::getQuickDropCounterString())) + .append(translateLetter2(GameModifiers::getPickUpTypeString())) .append(" ").append(translateLetter2( - modifiers->getMapDrawTypeString())) + GameModifiers::getMapDrawTypeString())) .append(" ").append(translateLetter2( - modifiers->getImitationModeString())) - .append(translateLetter2(modifiers->getCameraModeString())) - .append(translateLetter2(modifiers->getAwayModeString()))); + GameModifiers::getImitationModeString())) + .append(translateLetter2(GameModifiers::getCameraModeString())) + .append(translateLetter2(GameModifiers::getAwayModeString()))); bar->setProgress(50); if (settings.disableGameModifiers) |