From 41d9ca028de0740fd23a3dabaece8d1fd1bf93c1 Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Mon, 1 Jun 2015 17:42:48 +0300 Subject: Convert BattleGroundType enum into strong typed enum. --- src/enums/net/battlegroundtype.h | 18 +++++++++--------- src/net/battlegroundhandler.h | 2 +- src/net/eathena/battlegroundhandler.cpp | 2 +- src/net/eathena/battlegroundhandler.h | 2 +- src/net/tmwa/battlegroundhandler.cpp | 2 +- src/net/tmwa/battlegroundhandler.h | 2 +- 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; -- cgit v1.2.3-70-g09d2