From 90bfc776dc4975c523c4c35fb0778cd9b77dc164 Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Mon, 21 Jul 2014 23:33:48 +0300 Subject: move "change pvp attack type" option into gamemodifiers. --- src/gui/popups/statuspopup.cpp | 2 +- src/gui/windows/statuswindow.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'src/gui') 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())) -- cgit v1.2.3-70-g09d2