diff options
| author | Andrei Karas <akaras@inbox.ru> | 2015-09-23 21:37:09 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2015-09-23 21:37:09 +0300 |
| commit | 1d769f5e2dafcd9ab20264b8781f3e656af44fc2 (patch) | |
| tree | 8e6a1c77b01fbd05ca3b4a3684d83e8d6912bc45 | |
| parent | a6cd6b2374c55ff4342137d197a43d4656427365 (diff) | |
| download | mv-1d769f5e2dafcd9ab20264b8781f3e656af44fc2.tar.gz mv-1d769f5e2dafcd9ab20264b8781f3e656af44fc2.tar.bz2 mv-1d769f5e2dafcd9ab20264b8781f3e656af44fc2.tar.xz mv-1d769f5e2dafcd9ab20264b8781f3e656af44fc2.zip | |
Fix compilation without C++11 flags.
| -rw-r--r-- | src/net/eathena/npchandler.cpp | 2 | ||||
| -rw-r--r-- | src/net/eathena/npchandler.h | 2 | ||||
| -rw-r--r-- | src/net/npchandler.h | 2 | ||||
| -rw-r--r-- | src/net/tmwa/npchandler.cpp | 2 | ||||
| -rw-r--r-- | src/net/tmwa/npchandler.h | 2 |
5 files changed, 5 insertions, 5 deletions
diff --git a/src/net/eathena/npchandler.cpp b/src/net/eathena/npchandler.cpp index 97b1c28dc..c84c0cab6 100644 --- a/src/net/eathena/npchandler.cpp +++ b/src/net/eathena/npchandler.cpp @@ -196,7 +196,7 @@ void NpcHandler::selectAutoSpell(const int skillId) const } BeingId NpcHandler::getNpc(Net::MessageIn &msg, - const NpcAction action) + const NpcActionT action) { const BeingId npcId = msg.readBeingId("npc id"); diff --git a/src/net/eathena/npchandler.h b/src/net/eathena/npchandler.h index e05b93bd0..b1ef9128d 100644 --- a/src/net/eathena/npchandler.h +++ b/src/net/eathena/npchandler.h @@ -78,7 +78,7 @@ class NpcHandler final : public Ea::NpcHandler void refine(const int index) const override final; BeingId getNpc(Net::MessageIn &msg, - const NpcAction action) override final; + const NpcActionT action) override final; void identify(const int index) const override final; diff --git a/src/net/npchandler.h b/src/net/npchandler.h index bad291fc8..e3ef4ab23 100644 --- a/src/net/npchandler.h +++ b/src/net/npchandler.h @@ -46,7 +46,7 @@ class NpcHandler notfinal { } virtual BeingId getNpc(Net::MessageIn &msg, - const NpcAction action) = 0; + const NpcActionT action) = 0; virtual void talk(const BeingId npcId) const = 0; diff --git a/src/net/tmwa/npchandler.cpp b/src/net/tmwa/npchandler.cpp index f742ecb38..4b24bce1f 100644 --- a/src/net/tmwa/npchandler.cpp +++ b/src/net/tmwa/npchandler.cpp @@ -180,7 +180,7 @@ void NpcHandler::selectAutoSpell(const int skillId A_UNUSED) const } BeingId NpcHandler::getNpc(Net::MessageIn &msg, - const NpcAction action) + const NpcActionT action) { const BeingId npcId = msg.readBeingId("npc id"); diff --git a/src/net/tmwa/npchandler.h b/src/net/tmwa/npchandler.h index 51402768c..667999ccc 100644 --- a/src/net/tmwa/npchandler.h +++ b/src/net/tmwa/npchandler.h @@ -66,7 +66,7 @@ class NpcHandler final : public Ea::NpcHandler void completeProgressBar() const override final; BeingId getNpc(Net::MessageIn &msg, - const NpcAction action) override final; + const NpcAction actionT) override final; void produceMix(const int nameId, const int materialId1, |