From b2f0d495cd85188e0f9f2d4d363655da40e6e5e6 Mon Sep 17 00:00:00 2001
From: Ben Longbons <b.r.longbons@gmail.com>
Date: Thu, 22 Jan 2015 12:25:18 -0800
Subject: Have I mentioned that I hate ADL?

---
 src/map/mapflag.cpp    | 2 +-
 src/map/mapflag.hpp    | 2 +-
 src/map/mob.cpp        | 8 ++++----
 src/map/script-fun.cpp | 1 +
 4 files changed, 7 insertions(+), 6 deletions(-)

(limited to 'src/map')

diff --git a/src/map/mapflag.cpp b/src/map/mapflag.cpp
index 91dfe8d..d5e78d8 100644
--- a/src/map/mapflag.cpp
+++ b/src/map/mapflag.cpp
@@ -40,7 +40,7 @@ void MapFlags::set(MapFlag mf, bool val)
         flags &=~ static_cast<unsigned>(mf);
 }
 
-bool extract(XString str, MapFlag *mf)
+bool impl_extract(XString str, MapFlag *mf)
 {
     const struct
     {
diff --git a/src/map/mapflag.hpp b/src/map/mapflag.hpp
index d964405..5818697 100644
--- a/src/map/mapflag.hpp
+++ b/src/map/mapflag.hpp
@@ -75,7 +75,7 @@ public:
     void set(MapFlag, bool);
 };
 
-bool extract(XString str, MapFlag *mf);
+bool impl_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 b01a4ff..c690ad0 100644
--- a/src/map/mob.cpp
+++ b/src/map/mob.cpp
@@ -3428,7 +3428,7 @@ int mob_makedummymobdb(Species mob_class)
 }
 
 static
-bool extract(XString str, LevelElement *le)
+bool impl_extract(XString str, LevelElement *le)
 {
     int tmp;
     if (extract(str, &tmp))
@@ -3583,7 +3583,7 @@ bool mob_readdb(ZString filename)
 }
 
 static
-bool extract(XString str, MobSkillCondition *msc)
+bool impl_extract(XString str, MobSkillCondition *msc)
 {
     const struct
     {
@@ -3607,7 +3607,7 @@ bool extract(XString str, MobSkillCondition *msc)
 }
 
 static
-bool extract(XString str, MobSkillState *mss)
+bool impl_extract(XString str, MobSkillState *mss)
 {
     const struct
     {
@@ -3630,7 +3630,7 @@ bool extract(XString str, MobSkillState *mss)
 }
 
 static
-bool extract(XString str, MobSkillTarget *mst)
+bool impl_extract(XString str, MobSkillTarget *mst)
 {
     const struct
     {
diff --git a/src/map/script-fun.cpp b/src/map/script-fun.cpp
index cc28cd2..12f8679 100644
--- a/src/map/script-fun.cpp
+++ b/src/map/script-fun.cpp
@@ -30,6 +30,7 @@
 #include "../generic/random.hpp"
 
 #include "../io/cxxstdio.hpp"
+#include "../io/extract.hpp"
 
 #include "../net/timer.hpp"
 
-- 
cgit v1.2.3-70-g09d2