diff options
| author | Joseph Botosh <rumly111@gmail.com> | 2015-06-05 20:34:19 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2015-07-25 21:38:30 +0300 |
| commit | f67a60ea6108e2c70186bf4742c223179ac5f4be (patch) | |
| tree | c057d9dc5a8c9716b24b5ba2dc4cb576832ee1dc /src/gui | |
| parent | 760b544fb26dcfc5103a44bf977cd8cd95b0862a (diff) | |
| download | manaplus-f67a60ea6108e2c70186bf4742c223179ac5f4be.tar.gz manaplus-f67a60ea6108e2c70186bf4742c223179ac5f4be.tar.bz2 manaplus-f67a60ea6108e2c70186bf4742c223179ac5f4be.tar.xz manaplus-f67a60ea6108e2c70186bf4742c223179ac5f4be.zip | |
add targetingType feature
Diffstat (limited to 'src/gui')
| -rw-r--r-- | src/gui/popups/statuspopup.cpp | 3 | ||||
| -rw-r--r-- | src/gui/popups/statuspopup.h | 2 | ||||
| -rw-r--r-- | src/gui/widgets/tabs/setup_quick.cpp | 4 | ||||
| -rw-r--r-- | src/gui/windows/statuswindow.cpp | 3 |
4 files changed, 10 insertions, 2 deletions
diff --git a/src/gui/popups/statuspopup.cpp b/src/gui/popups/statuspopup.cpp index c54a57874..b81e3fe1e 100644 --- a/src/gui/popups/statuspopup.cpp +++ b/src/gui/popups/statuspopup.cpp @@ -75,6 +75,7 @@ void StatusPopup::postInit() addLabel(12); addLabel(13); addLabel(14); + addLabel(15); y += 4; addLabel(11); } @@ -164,4 +165,6 @@ void StatusPopup::updateLabels() const InputAction::AWAY); setLabelText(14, GameModifiers::getCameraModeString(), InputAction::CAMERA); + setLabelText(15, GameModifiers::getTargetingTypeString(), + InputAction::CHANGE_TARGETING_TYPE); } diff --git a/src/gui/popups/statuspopup.h b/src/gui/popups/statuspopup.h index 43b793821..ed39c3ab6 100644 --- a/src/gui/popups/statuspopup.h +++ b/src/gui/popups/statuspopup.h @@ -30,7 +30,7 @@ class Label; -const int STATUSPOPUP_NUM_LABELS = 15; +const int STATUSPOPUP_NUM_LABELS = 16; /** * A popup that displays information about an item. diff --git a/src/gui/widgets/tabs/setup_quick.cpp b/src/gui/widgets/tabs/setup_quick.cpp index a85fdc0ca..e9199aa45 100644 --- a/src/gui/widgets/tabs/setup_quick.cpp +++ b/src/gui/widgets/tabs/setup_quick.cpp @@ -104,6 +104,10 @@ Setup_Quick::Setup_Quick(const Widget2 *const widget) : &GameModifiers::getAwayModeString, &GameModifiers::changeAwayMode); + new SetupQuickItem("", this, "targetingTypeEvent", + &GameModifiers::getTargetingTypeString, + &GameModifiers::changeTargetingType); + setDimension(Rect(0, 0, 550, 350)); } diff --git a/src/gui/windows/statuswindow.cpp b/src/gui/windows/statuswindow.cpp index 5f8df4ef7..ea73c46b5 100644 --- a/src/gui/windows/statuswindow.cpp +++ b/src/gui/windows/statuswindow.cpp @@ -671,7 +671,8 @@ void StatusWindow::updateStatusBar(ProgressBar *const bar, .append(" ").append(translateLetter2( GameModifiers::getImitationModeString())) .append(translateLetter2(GameModifiers::getCameraModeString())) - .append(translateLetter2(GameModifiers::getAwayModeString()))); + .append(translateLetter2(GameModifiers::getAwayModeString())) + .append(translateLetter2(GameModifiers::getTargetingTypeString()))); bar->setProgress(50); if (settings.disableGameModifiers) |