summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2015-06-01 17:42:48 +0300
committerAndrei Karas <akaras@inbox.ru>2015-06-01 17:42:48 +0300
commit41d9ca028de0740fd23a3dabaece8d1fd1bf93c1 (patch)
tree9a6b3cc1c1fb9d843a226e91fb0330b35ae3c737
parentc04887aa87c5194a4774fe87cb1a969ba086a439 (diff)
downloadmv-41d9ca028de0740fd23a3dabaece8d1fd1bf93c1.tar.gz
mv-41d9ca028de0740fd23a3dabaece8d1fd1bf93c1.tar.bz2
mv-41d9ca028de0740fd23a3dabaece8d1fd1bf93c1.tar.xz
mv-41d9ca028de0740fd23a3dabaece8d1fd1bf93c1.zip
Convert BattleGroundType enum into strong typed enum.
-rw-r--r--src/enums/net/battlegroundtype.h18
-rw-r--r--src/net/battlegroundhandler.h2
-rw-r--r--src/net/eathena/battlegroundhandler.cpp2
-rw-r--r--src/net/eathena/battlegroundhandler.h2
-rw-r--r--src/net/tmwa/battlegroundhandler.cpp2
-rw-r--r--src/net/tmwa/battlegroundhandler.h2
6 files changed, 14 insertions, 14 deletions
diff --git a/src/enums/net/battlegroundtype.h b/src/enums/net/battlegroundtype.h
index e0ce20c41..b3cae90a3 100644
--- a/src/enums/net/battlegroundtype.h
+++ b/src/enums/net/battlegroundtype.h
@@ -22,16 +22,16 @@
#define ENUMS_NET_BATTLEGROUNDTYPE_H
#ifdef EATHENA_SUPPORT
-namespace BattleGroundType
+#include "enums/simpletypes/enumdefines.h"
+
+enumStart(BattleGroundType)
{
- enum Type
- {
- Invalid = 0,
- Individual = 1,
- Party = 2,
- Guild = 4
- };
-} // namespace BattleGroundType
+ Invalid = 0,
+ Individual = 1,
+ Party = 2,
+ Guild = 4
+}
+enumEnd(BattleGroundType);
#endif // EATHENA_SUPPORT
#endif // ENUMS_NET_BATTLEGROUNDTYPE_H
diff --git a/src/net/battlegroundhandler.h b/src/net/battlegroundhandler.h
index e03757141..ce7b6584e 100644
--- a/src/net/battlegroundhandler.h
+++ b/src/net/battlegroundhandler.h
@@ -38,7 +38,7 @@ class BattleGroundHandler notfinal
virtual ~BattleGroundHandler()
{ }
- virtual void registerBg(const BattleGroundType::Type &type,
+ virtual void registerBg(const BattleGroundTypeT &type,
const std::string &name) const = 0;
virtual void rekoveRequest(const std::string &name) const = 0;
diff --git a/src/net/eathena/battlegroundhandler.cpp b/src/net/eathena/battlegroundhandler.cpp
index dd1f6bfe9..3a59b495e 100644
--- a/src/net/eathena/battlegroundhandler.cpp
+++ b/src/net/eathena/battlegroundhandler.cpp
@@ -151,7 +151,7 @@ void BattleGroundHandler::processBattleJoined(Net::MessageIn &msg)
msg.readInt32("position");
}
-void BattleGroundHandler::registerBg(const BattleGroundType::Type &type,
+void BattleGroundHandler::registerBg(const BattleGroundTypeT &type,
const std::string &name) const
{
createOutPacket(CMSG_BATTLE_REGISTER);
diff --git a/src/net/eathena/battlegroundhandler.h b/src/net/eathena/battlegroundhandler.h
index 233f99e76..3490331c7 100644
--- a/src/net/eathena/battlegroundhandler.h
+++ b/src/net/eathena/battlegroundhandler.h
@@ -39,7 +39,7 @@ class BattleGroundHandler final : public MessageHandler,
void handleMessage(Net::MessageIn &msg) override final;
- void registerBg(const BattleGroundType::Type &type,
+ void registerBg(const BattleGroundTypeT &type,
const std::string &name) const override final;
void rekoveRequest(const std::string &name) const override final;
diff --git a/src/net/tmwa/battlegroundhandler.cpp b/src/net/tmwa/battlegroundhandler.cpp
index e9a26180b..31dbc1006 100644
--- a/src/net/tmwa/battlegroundhandler.cpp
+++ b/src/net/tmwa/battlegroundhandler.cpp
@@ -42,7 +42,7 @@ void BattleGroundHandler::handleMessage(Net::MessageIn &msg A_UNUSED)
{
}
-void BattleGroundHandler::registerBg(const BattleGroundType::Type &type
+void BattleGroundHandler::registerBg(const BattleGroundTypeT &type
A_UNUSED,
const std::string &name A_UNUSED) const
{
diff --git a/src/net/tmwa/battlegroundhandler.h b/src/net/tmwa/battlegroundhandler.h
index cb8e5b679..1755bb980 100644
--- a/src/net/tmwa/battlegroundhandler.h
+++ b/src/net/tmwa/battlegroundhandler.h
@@ -40,7 +40,7 @@ class BattleGroundHandler final : public MessageHandler,
void handleMessage(Net::MessageIn &msg) override final;
- void registerBg(const BattleGroundType::Type &type,
+ void registerBg(const BattleGroundTypeT &type,
const std::string &name) const override final;
void rekoveRequest(const std::string &name) const override final;