From 44ba9a9eebec2ffe202fc5594f76864a56f3730a Mon Sep 17 00:00:00 2001 From: Ben Longbons Date: Wed, 23 Jul 2014 17:05:58 -0700 Subject: Enums are not usually integers, sorry --- src/map/mob.cpp | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) (limited to 'src/map/mob.cpp') 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(XString str, MobSkillCondition *msc) +static +bool extract(XString str, MobSkillCondition *msc) { const struct { @@ -3606,8 +3608,8 @@ bool extract(XString str, MobSkillCondition *msc) return false; } -template<> -bool extract(XString str, MobSkillState *mss) +static +bool extract(XString str, MobSkillState *mss) { const struct { @@ -3629,8 +3631,8 @@ bool extract(XString str, MobSkillState *mss) return false; } -template<> -bool extract(XString str, MobSkillTarget *mst) +static +bool extract(XString str, MobSkillTarget *mst) { const struct { -- cgit v1.2.3-70-g09d2