diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/enums/net/auctionsearchtype.h | 22 | ||||
| -rw-r--r-- | src/net/auctionhandler.h | 2 | ||||
| -rw-r--r-- | src/net/eathena/auctionhandler.cpp | 2 | ||||
| -rw-r--r-- | src/net/eathena/auctionhandler.h | 2 | ||||
| -rw-r--r-- | src/net/tmwa/auctionhandler.cpp | 2 | ||||
| -rw-r--r-- | src/net/tmwa/auctionhandler.h | 2 |
6 files changed, 16 insertions, 16 deletions
diff --git a/src/enums/net/auctionsearchtype.h b/src/enums/net/auctionsearchtype.h index 108947e41..9912d6039 100644 --- a/src/enums/net/auctionsearchtype.h +++ b/src/enums/net/auctionsearchtype.h @@ -23,18 +23,18 @@ #define ENUMS_NET_AUCTIONSEARCHTYPE_H #ifdef EATHENA_SUPPORT -namespace AuctionSearchType +#include "enums/simpletypes/enumdefines.h" + +enumStart(AuctionSearchType) { - enum Type - { - Armor = 0, - Weapon = 1, - Card = 2, - Misc = 3, - Name = 4, - AuctionId = 5 - }; -} // namespace AuctionSearchType + Armor = 0, + Weapon = 1, + Card = 2, + Misc = 3, + Name = 4, + AuctionId = 5 +} +enumEnd(AuctionSearchType); #endif // EATHENA_SUPPORT #endif // ENUMS_NET_AUCTIONSEARCHTYPE_H diff --git a/src/net/auctionhandler.h b/src/net/auctionhandler.h index 02d85da22..5d9ed9974 100644 --- a/src/net/auctionhandler.h +++ b/src/net/auctionhandler.h @@ -56,7 +56,7 @@ class AuctionHandler notfinal virtual void bid(const int auctionId, const int money) const = 0; - virtual void search(const AuctionSearchType::Type type, + virtual void search(const AuctionSearchTypeT type, const int auctionId, const std::string &text, const int page) const = 0; diff --git a/src/net/eathena/auctionhandler.cpp b/src/net/eathena/auctionhandler.cpp index 404e38c24..586e276b8 100644 --- a/src/net/eathena/auctionhandler.cpp +++ b/src/net/eathena/auctionhandler.cpp @@ -175,7 +175,7 @@ void AuctionHandler::bid(const int auctionId, outMsg.writeInt32(money, "money"); } -void AuctionHandler::search(const AuctionSearchType::Type type, +void AuctionHandler::search(const AuctionSearchTypeT type, const int auctionId, const std::string &text, const int page) const diff --git a/src/net/eathena/auctionhandler.h b/src/net/eathena/auctionhandler.h index a513f9c89..db20ee341 100644 --- a/src/net/eathena/auctionhandler.h +++ b/src/net/eathena/auctionhandler.h @@ -54,7 +54,7 @@ class AuctionHandler final : public MessageHandler, public Net::AuctionHandler void bid(const int auctionId, const int money) const override final; - void search(const AuctionSearchType::Type type, + void search(const AuctionSearchTypeT type, const int auctionId, const std::string &text, const int page) const override final; diff --git a/src/net/tmwa/auctionhandler.cpp b/src/net/tmwa/auctionhandler.cpp index 773c95f1d..e63b76a00 100644 --- a/src/net/tmwa/auctionhandler.cpp +++ b/src/net/tmwa/auctionhandler.cpp @@ -70,7 +70,7 @@ void AuctionHandler::bid(const int auctionId A_UNUSED, { } -void AuctionHandler::search(const AuctionSearchType::Type type A_UNUSED, +void AuctionHandler::search(const AuctionSearchTypeT type A_UNUSED, const int auctionId A_UNUSED, const std::string &text A_UNUSED, const int page A_UNUSED) const diff --git a/src/net/tmwa/auctionhandler.h b/src/net/tmwa/auctionhandler.h index 0cc72f184..5df04b778 100644 --- a/src/net/tmwa/auctionhandler.h +++ b/src/net/tmwa/auctionhandler.h @@ -54,7 +54,7 @@ class AuctionHandler final : public MessageHandler, public Net::AuctionHandler void bid(const int auctionId, const int money) const override final; - void search(const AuctionSearchType::Type type, + void search(const AuctionSearchTypeT type, const int auctionId, const std::string &text, const int page) const override final; |