diff options
| -rw-r--r-- | src/enums/net/storesearchtype.h | 12 | ||||
| -rw-r--r-- | src/net/eathena/searchstorehandler.cpp | 2 | ||||
| -rw-r--r-- | src/net/eathena/searchstorehandler.h | 2 | ||||
| -rw-r--r-- | src/net/searchstorehandler.h | 2 | ||||
| -rw-r--r-- | src/net/tmwa/searchstorehandler.cpp | 2 | ||||
| -rw-r--r-- | src/net/tmwa/searchstorehandler.h | 2 |
6 files changed, 11 insertions, 11 deletions
diff --git a/src/enums/net/storesearchtype.h b/src/enums/net/storesearchtype.h index e04472ce6..8f3764aca 100644 --- a/src/enums/net/storesearchtype.h +++ b/src/enums/net/storesearchtype.h @@ -22,14 +22,14 @@ #define ENUMS_NET_STORESEARCHTYPE_H #ifdef EATHENA_SUPPORT -namespace StoreSearchType +#include "enums/simpletypes/enumdefines.h" + +enumStart(StoreSearchType) { - enum Type - { - Vending = 0, - BuingStore = 1 - }; + Vending = 0, + BuingStore = 1 } +enumEnd(StoreSearchType); #endif // EATHENA_SUPPORT #endif // ENUMS_NET_STORESEARCHTYPE_H diff --git a/src/net/eathena/searchstorehandler.cpp b/src/net/eathena/searchstorehandler.cpp index 7ced22765..51aaccd98 100644 --- a/src/net/eathena/searchstorehandler.cpp +++ b/src/net/eathena/searchstorehandler.cpp @@ -75,7 +75,7 @@ void SearchStoreHandler::handleMessage(Net::MessageIn &msg) } } -void SearchStoreHandler::search(const StoreSearchType::Type type, +void SearchStoreHandler::search(const StoreSearchTypeT type, const int minPrice, const int maxPrice, const int itemId) const diff --git a/src/net/eathena/searchstorehandler.h b/src/net/eathena/searchstorehandler.h index 3a449f512..29ff9439c 100644 --- a/src/net/eathena/searchstorehandler.h +++ b/src/net/eathena/searchstorehandler.h @@ -37,7 +37,7 @@ class SearchStoreHandler final : public MessageHandler, void handleMessage(Net::MessageIn &msg) override final; - void search(const StoreSearchType::Type type, + void search(const StoreSearchTypeT type, const int minPrice, const int maxPrice, const int itemId) const override final; diff --git a/src/net/searchstorehandler.h b/src/net/searchstorehandler.h index 19ef98af6..059441c9c 100644 --- a/src/net/searchstorehandler.h +++ b/src/net/searchstorehandler.h @@ -38,7 +38,7 @@ class SearchStoreHandler notfinal virtual ~SearchStoreHandler() { } - virtual void search(const StoreSearchType::Type type, + virtual void search(const StoreSearchTypeT type, const int minPrice, const int maxPrice, const int itemId) const = 0; diff --git a/src/net/tmwa/searchstorehandler.cpp b/src/net/tmwa/searchstorehandler.cpp index b4c304573..091903e4c 100644 --- a/src/net/tmwa/searchstorehandler.cpp +++ b/src/net/tmwa/searchstorehandler.cpp @@ -47,7 +47,7 @@ void SearchStoreHandler::handleMessage(Net::MessageIn &msg) } } -void SearchStoreHandler::search(const StoreSearchType::Type type A_UNUSED, +void SearchStoreHandler::search(const StoreSearchTypeT type A_UNUSED, const int minPrice A_UNUSED, const int maxPrice A_UNUSED, const int itemId A_UNUSED) const diff --git a/src/net/tmwa/searchstorehandler.h b/src/net/tmwa/searchstorehandler.h index b0217d3cb..ca1efcd9c 100644 --- a/src/net/tmwa/searchstorehandler.h +++ b/src/net/tmwa/searchstorehandler.h @@ -39,7 +39,7 @@ class SearchStoreHandler final : public MessageHandler, void handleMessage(Net::MessageIn &msg) override final; - void search(const StoreSearchType::Type type, + void search(const StoreSearchTypeT type, const int minPrice, const int maxPrice, const int itemId) const override final; |