diff options
| author | Andrei Karas <akaras@inbox.ru> | 2014-12-02 12:53:06 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2014-12-02 12:53:06 +0300 |
| commit | c26b6e2c74750c1f4f99ef5d673ea6fc2aac767b (patch) | |
| tree | a292a697a38e6bc3b5992ee2f7e4ac2e55b96a52 | |
| parent | 892424cc005d41b8976ae9193a3a4161b5c1950f (diff) | |
| download | plus-c26b6e2c74750c1f4f99ef5d673ea6fc2aac767b.tar.gz plus-c26b6e2c74750c1f4f99ef5d673ea6fc2aac767b.tar.bz2 plus-c26b6e2c74750c1f4f99ef5d673ea6fc2aac767b.tar.xz plus-c26b6e2c74750c1f4f99ef5d673ea6fc2aac767b.zip | |
Rename PlayerDeathListener into PlayerPostDeathListener.
| -rw-r--r-- | src/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | src/Makefile.am | 2 | ||||
| -rw-r--r-- | src/listeners/playerpostdeathlistener.h (renamed from src/listeners/playerdeathlistener.h) | 2 | ||||
| -rw-r--r-- | src/net/ea/playerhandler.cpp | 6 |
4 files changed, 6 insertions, 6 deletions
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 7b704787e..4b0805bae 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -1114,7 +1114,7 @@ SET(SRCS listeners/openurllistener.h listeners/pincodelistener.cpp listeners/pincodelistener.h - listeners/playerdeathlistener.h + listeners/playerpostdeathlistener.h listeners/playerlistener.cpp listeners/playerlistener.h gui/rect.h diff --git a/src/Makefile.am b/src/Makefile.am index 2660d26bb..fdbf00bd5 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -205,7 +205,7 @@ manaplus_SOURCES += events/actionevent.h \ listeners/openurllistener.h \ listeners/pincodelistener.cpp \ listeners/pincodelistener.h \ - listeners/playerdeathlistener.h \ + listeners/playerpostdeathlistener.h \ listeners/playerlistener.cpp \ listeners/playerlistener.h \ gui/rect.h \ diff --git a/src/listeners/playerdeathlistener.h b/src/listeners/playerpostdeathlistener.h index 9f7974ae2..6ab8fd25b 100644 --- a/src/listeners/playerdeathlistener.h +++ b/src/listeners/playerpostdeathlistener.h @@ -41,7 +41,7 @@ extern OkDialog *deathNotice; /** * Listener used for handling death message. */ -struct PlayerDeathListener final : public ActionListener +struct PlayerPostDeathListener final : public ActionListener { void action(const ActionEvent &event A_UNUSED) { diff --git a/src/net/ea/playerhandler.cpp b/src/net/ea/playerhandler.cpp index baea3b1e6..940b629d4 100644 --- a/src/net/ea/playerhandler.cpp +++ b/src/net/ea/playerhandler.cpp @@ -45,7 +45,7 @@ #include "resources/map/map.h" -#include "listeners/playerdeathlistener.h" +#include "listeners/playerpostdeathlistener.h" #include "listeners/weightlistener.h" #include "net/messagein.h" @@ -65,7 +65,7 @@ static const int MAP_TELEPORT_SCROLL_DISTANCE = 8; namespace { WeightListener weightListener; - PlayerDeathListener deathListener; + PlayerPostDeathListener postDeathListener; } // anonymous namespace namespace Ea @@ -196,7 +196,7 @@ void PlayerHandler::processPlayerStatUpdate1(Net::MessageIn &msg) _("Revive"), DialogType::OK, false, true, nullptr, 260); - deathNotice->addActionListener(&deathListener); + deathNotice->addActionListener(&postDeathListener); if (localPlayer->getCurrentAction() != BeingAction::DEAD) { localPlayer->setAction(BeingAction::DEAD, 0); |