summaryrefslogtreecommitdiff
path: root/src/gui
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2014-07-21 23:33:48 +0300
committerAndrei Karas <akaras@inbox.ru>2014-07-21 23:33:48 +0300
commit90bfc776dc4975c523c4c35fb0778cd9b77dc164 (patch)
treed7fdd90433077b20d847ee39de8a05d33509fcd3 /src/gui
parentc544a5ebb53d51fa98392188d2b44dc6ec27c390 (diff)
downloadmv-90bfc776dc4975c523c4c35fb0778cd9b77dc164.tar.gz
mv-90bfc776dc4975c523c4c35fb0778cd9b77dc164.tar.bz2
mv-90bfc776dc4975c523c4c35fb0778cd9b77dc164.tar.xz
mv-90bfc776dc4975c523c4c35fb0778cd9b77dc164.zip
move "change pvp attack type" option into gamemodifiers.
Diffstat (limited to 'src/gui')
-rw-r--r--src/gui/popups/statuspopup.cpp2
-rw-r--r--src/gui/windows/statuswindow.cpp2
2 files changed, 2 insertions, 2 deletions
diff --git a/src/gui/popups/statuspopup.cpp b/src/gui/popups/statuspopup.cpp
index 4612844a8..8536e25d8 100644
--- a/src/gui/popups/statuspopup.cpp
+++ b/src/gui/popups/statuspopup.cpp
@@ -160,7 +160,7 @@ void StatusPopup::updateLabels() const
InputAction::PATHFIND);
setLabelText(9, modifiers->getMagicAttackString(),
InputAction::SWITCH_MAGIC_ATTACK);
- setLabelText(10, player_node->getPvpAttackString(),
+ setLabelText(10, modifiers->getPvpAttackTypeString(),
InputAction::SWITCH_PVP_ATTACK);
setLabelText(11, player_node->getGameModifiersString(),
InputAction::DISABLE_GAME_MODIFIERS);
diff --git a/src/gui/windows/statuswindow.cpp b/src/gui/windows/statuswindow.cpp
index 27e47e1ad..aee371f9e 100644
--- a/src/gui/windows/statuswindow.cpp
+++ b/src/gui/windows/statuswindow.cpp
@@ -650,7 +650,7 @@ void StatusWindow::updateStatusBar(ProgressBar *const bar,
modifiers->getAttackWeaponTypeString()))
.append(translateLetter2(modifiers->getAttackTypeString()))
.append(translateLetter2(modifiers->getMagicAttackString()))
- .append(translateLetter2(player_node->getPvpAttackString()))
+ .append(translateLetter2(modifiers->getPvpAttackTypeString()))
.append(" ").append(translateLetter2(
modifiers->getQuickDropCounterString()))
.append(translateLetter2(modifiers->getPickUpTypeString()))