Enums are not usually integers, sorry

15 files changed, 24 insertions, 10 deletions

diff --git a/src/map/atcommand.cpp b/src/map/atcommand.cpp
index 11f6eb1..342f6ef 100644
--- a/src/map/atcommand.cpp
+++ b/src/map/atcommand.cpp
@@ -39,6 +39,7 @@
 #include "../generic/random.hpp"
 
 #include "../io/cxxstdio.hpp"
+#include "../io/cxxstdio_enums.hpp"
 #include "../io/read.hpp"
 #include "../io/write.hpp"
 
@@ -48,6 +49,7 @@
 #include "../mmo/config_parse.hpp"
 #include "../mmo/core.hpp"
 #include "../mmo/extract.hpp"
+#include "../mmo/extract_enums.hpp"
 #include "../mmo/human_time_diff.hpp"
 #include "../mmo/ids.hpp"
 #include "../mmo/mmo.hpp"
diff --git a/src/map/battle.cpp b/src/map/battle.cpp
index eabe8a6..856408c 100644
--- a/src/map/battle.cpp
+++ b/src/map/battle.cpp
@@ -32,6 +32,7 @@
 #include "../generic/random.hpp"
 
 #include "../io/cxxstdio.hpp"
+#include "../io/cxxstdio_enums.hpp"
 #include "../io/read.hpp"
 
 #include "../mmo/config_parse.hpp"
diff --git a/src/map/clif.cpp b/src/map/clif.cpp
index e7557c8..bb21ca9 100644
--- a/src/map/clif.cpp
+++ b/src/map/clif.cpp
@@ -36,6 +36,7 @@
 #include "../strings/xstring.hpp"
 
 #include "../io/cxxstdio.hpp"
+#include "../io/cxxstdio_enums.hpp"
 #include "../io/write.hpp"
 
 #include "../net/ip.hpp"
diff --git a/src/map/itemdb.cpp b/src/map/itemdb.cpp
index edc9982..50cc5c4 100644
--- a/src/map/itemdb.cpp
+++ b/src/map/itemdb.cpp
@@ -33,6 +33,7 @@
 
 #include "../mmo/config_parse.hpp"
 #include "../mmo/extract.hpp"
+#include "../mmo/extract_enums.hpp"
 
 #include "../poison.hpp"
 
diff --git a/src/map/magic-expr.cpp b/src/map/magic-expr.cpp
index dfb65c5..2d2eba9 100644
--- a/src/map/magic-expr.cpp
+++ b/src/map/magic-expr.cpp
@@ -33,6 +33,7 @@
 #include "../generic/random.hpp"
 
 #include "../io/cxxstdio.hpp"
+#include "../io/cxxstdio_enums.hpp"
 
 #include "battle.hpp"
 #include "itemdb.hpp"
diff --git a/src/map/magic-interpreter-base.cpp b/src/map/magic-interpreter-base.cpp
index 768a7df..e628719 100644
--- a/src/map/magic-interpreter-base.cpp
+++ b/src/map/magic-interpreter-base.cpp
@@ -25,6 +25,7 @@
 #include "../strings/xstring.hpp"
 
 #include "../io/cxxstdio.hpp"
+#include "../io/cxxstdio_enums.hpp"
 
 #include "../net/timer.hpp"
 
diff --git a/src/map/magic-stmt.cpp b/src/map/magic-stmt.cpp
index 9aca511..f8f3b03 100644
--- a/src/map/magic-stmt.cpp
+++ b/src/map/magic-stmt.cpp
@@ -29,6 +29,7 @@
 #include "../generic/random2.hpp"
 
 #include "../io/cxxstdio.hpp"
+#include "../io/cxxstdio_enums.hpp"
 
 #include "../net/timer.hpp"
 
diff --git a/src/map/map.cpp b/src/map/map.cpp
index 033f299..832e6aa 100644
--- a/src/map/map.cpp
+++ b/src/map/map.cpp
@@ -45,6 +45,7 @@
 #include "../generic/random2.hpp"
 
 #include "../io/cxxstdio.hpp"
+#include "../io/cxxstdio_enums.hpp"
 #include "../io/read.hpp"
 #include "../io/tty.hpp"
 #include "../io/write.hpp"
diff --git a/src/map/mapflag.cpp b/src/map/mapflag.cpp
index f9cf8f6..be2ae67 100644
--- a/src/map/mapflag.cpp
+++ b/src/map/mapflag.cpp
@@ -38,8 +38,7 @@ void MapFlags::set(MapFlag mf, bool val)
         flags &=~ static_cast<unsigned>(mf);
 }
 
-template<>
-bool extract<MapFlag, void, void>(XString str, MapFlag *mf)
+bool extract(XString str, MapFlag *mf)
 {
     const struct
     {
diff --git a/src/map/mapflag.hpp b/src/map/mapflag.hpp
index 197d250..6d046fa 100644
--- a/src/map/mapflag.hpp
+++ b/src/map/mapflag.hpp
@@ -77,8 +77,7 @@ public:
     void set(MapFlag, bool);
 };
 
-template<>
-bool extract<MapFlag, void, void>(XString str, MapFlag *mf);
+bool extract(XString str, MapFlag *mf);
 
 MapFlag map_flag_from_int(int shift);
 } // namespace tmwa
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
     {
diff --git a/src/map/pc.cpp b/src/map/pc.cpp
index 03e2e76..0cb8382 100644
--- a/src/map/pc.cpp
+++ b/src/map/pc.cpp
@@ -37,6 +37,7 @@
 #include "../generic/random.hpp"
 
 #include "../io/cxxstdio.hpp"
+#include "../io/cxxstdio_enums.hpp"
 #include "../io/read.hpp"
 
 #include "../net/timer.hpp"
diff --git a/src/map/script.cpp b/src/map/script.cpp
index 0b2d05e..22fcb41 100644
--- a/src/map/script.cpp
+++ b/src/map/script.cpp
@@ -44,6 +44,7 @@
 #include "../generic/random.hpp"
 
 #include "../io/cxxstdio.hpp"
+#include "../io/cxxstdio_enums.hpp"
 #include "../io/lock.hpp"
 #include "../io/read.hpp"
 #include "../io/write.hpp"
diff --git a/src/map/skill-pools.cpp b/src/map/skill-pools.cpp
index e37b7e3..89bf426 100644
--- a/src/map/skill-pools.cpp
+++ b/src/map/skill-pools.cpp
@@ -21,6 +21,7 @@
 //    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #include "../io/cxxstdio.hpp"
+#include "../io/cxxstdio_enums.hpp"
 
 #include "battle.hpp"
 #include "pc.hpp"
diff --git a/src/map/skill.cpp b/src/map/skill.cpp
index f579920..20dcb1a 100644
--- a/src/map/skill.cpp
+++ b/src/map/skill.cpp
@@ -39,11 +39,13 @@
 #include "../generic/random.hpp"
 
 #include "../io/cxxstdio.hpp"
+#include "../io/cxxstdio_enums.hpp"
 #include "../io/read.hpp"
 
 #include "../net/timer.hpp"
 
 #include "../mmo/extract.hpp"
+#include "../mmo/extract_enums.hpp"
 
 #include "battle.hpp"
 #include "clif.hpp"