diff options
| author | Ben Longbons <b.r.longbons@gmail.com> | 2014-07-23 17:05:58 -0700 |
|---|---|---|
| committer | Ben Longbons <b.r.longbons@gmail.com> | 2014-08-05 15:59:36 -0700 |
| commit | 44ba9a9eebec2ffe202fc5594f76864a56f3730a (patch) | |
| tree | 3788e0507c1a116c45df7a1dd9275784de4d9b5a /src/map/mob.cpp | |
| parent | 738e72ef3b38eef4e0684d49873714a602df53df (diff) | |
| download | tmwa-44ba9a9eebec2ffe202fc5594f76864a56f3730a.tar.gz tmwa-44ba9a9eebec2ffe202fc5594f76864a56f3730a.tar.bz2 tmwa-44ba9a9eebec2ffe202fc5594f76864a56f3730a.tar.xz tmwa-44ba9a9eebec2ffe202fc5594f76864a56f3730a.zip | |
Enums are not usually integers, sorry
Diffstat (limited to 'src/map/mob.cpp')
| -rw-r--r-- | src/map/mob.cpp | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/src/map/mob.cpp b/src/map/mob.cpp index 1fd8cf3..dd061d0 100644 --- a/src/map/mob.cpp +++ b/src/map/mob.cpp @@ -36,6 +36,7 @@ #include "../generic/random.hpp" #include "../io/cxxstdio.hpp" +#include "../io/cxxstdio_enums.hpp" #include "../io/read.hpp" #include "../net/socket.hpp" @@ -43,6 +44,7 @@ #include "../mmo/config_parse.hpp" #include "../mmo/extract.hpp" +#include "../mmo/extract_enums.hpp" #include "battle.hpp" #include "clif.hpp" @@ -3582,8 +3584,8 @@ bool mob_readdb(ZString filename) return rv; } -template<> -bool extract<MobSkillCondition, void, void>(XString str, MobSkillCondition *msc) +static +bool extract(XString str, MobSkillCondition *msc) { const struct { @@ -3606,8 +3608,8 @@ bool extract<MobSkillCondition, void, void>(XString str, MobSkillCondition *msc) return false; } -template<> -bool extract<MobSkillState, void, void>(XString str, MobSkillState *mss) +static +bool extract(XString str, MobSkillState *mss) { const struct { @@ -3629,8 +3631,8 @@ bool extract<MobSkillState, void, void>(XString str, MobSkillState *mss) return false; } -template<> -bool extract<MobSkillTarget, void, void>(XString str, MobSkillTarget *mst) +static +bool extract(XString str, MobSkillTarget *mst) { const struct { |