diff options
author | Andrei Karas <akaras@inbox.ru> | 2015-04-17 14:10:17 +0300 |
---|---|---|
committer | Andrei Karas <akaras@inbox.ru> | 2015-04-17 14:10:17 +0300 |
commit | 8314f36b8b941ddc0fbe0014ea8bea7ecbdc43fe (patch) | |
tree | 397f16ace38baf62ebc4b39bd7a1b15ed42e7440 | |
parent | de1c28279bebbbd266e5c3020a38274e20cebb5c (diff) | |
download | manaplus-8314f36b8b941ddc0fbe0014ea8bea7ecbdc43fe.tar.gz manaplus-8314f36b8b941ddc0fbe0014ea8bea7ecbdc43fe.tar.bz2 manaplus-8314f36b8b941ddc0fbe0014ea8bea7ecbdc43fe.tar.xz manaplus-8314f36b8b941ddc0fbe0014ea8bea7ecbdc43fe.zip |
Add eathena defines into cookingtype enum.
-rw-r--r-- | src/enums/being/cookingtype.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 |
4 files changed, 8 insertions, 0 deletions
diff --git a/src/enums/being/cookingtype.h b/src/enums/being/cookingtype.h index d2c50cd01..0bd521387 100644 --- a/src/enums/being/cookingtype.h +++ b/src/enums/being/cookingtype.h @@ -20,6 +20,7 @@ #ifndef ENUMS_BEING_COOKINGTYPE_H #define ENUMS_BEING_COOKINGTYPE_H +#ifdef EATHENA_SUPPORT namespace CookingType { @@ -34,4 +35,5 @@ namespace CookingType }; } // namespace CookingType +#endif // EATHENA_SUPPORT #endif // ENUMS_BEING_COOKINGTYPE_H diff --git a/src/net/npchandler.h b/src/net/npchandler.h index 626e742dd..42eaabb00 100644 --- a/src/net/npchandler.h +++ b/src/net/npchandler.h @@ -74,8 +74,10 @@ class NpcHandler notfinal const int materialId2, const int materialId3) const = 0; +#ifdef EATHENA_SUPPORT virtual void cooking(const CookingType::Type type, const int nameId) const = 0; +#endif virtual void repair(const int index) const = 0; diff --git a/src/net/tmwa/npchandler.cpp b/src/net/tmwa/npchandler.cpp index 26ac27b84..3fd1fed60 100644 --- a/src/net/tmwa/npchandler.cpp +++ b/src/net/tmwa/npchandler.cpp @@ -215,10 +215,12 @@ void NpcHandler::produceMix(const int nameId A_UNUSED, { } +#ifdef EATHENA_SUPPORT void NpcHandler::cooking(const CookingType::Type type A_UNUSED, const int nameId A_UNUSED) const { } +#endif void NpcHandler::repair(const int index A_UNUSED) const { diff --git a/src/net/tmwa/npchandler.h b/src/net/tmwa/npchandler.h index d82885da0..f8baff5d3 100644 --- a/src/net/tmwa/npchandler.h +++ b/src/net/tmwa/npchandler.h @@ -74,8 +74,10 @@ class NpcHandler final : public MessageHandler, public Ea::NpcHandler const int materialId2, const int materialId3) const override final; +#ifdef EATHENA_SUPPORT void cooking(const CookingType::Type type, const int nameId) const override final; +#endif void repair(const int index) const override final; |