diff options
| author | Ben Longbons <b.r.longbons@gmail.com> | 2015-01-22 12:25:18 -0800 |
|---|---|---|
| committer | Ben Longbons <b.r.longbons@gmail.com> | 2015-01-22 12:25:18 -0800 |
| commit | b2f0d495cd85188e0f9f2d4d363655da40e6e5e6 (patch) | |
| tree | ccc8997361bd66efeea6e7e1502e1b483f04ed7f /src/map | |
| parent | 57e5142d5c9d326912610e3bd60743420f8a328a (diff) | |
| download | tmwa-b2f0d495cd85188e0f9f2d4d363655da40e6e5e6.tar.gz tmwa-b2f0d495cd85188e0f9f2d4d363655da40e6e5e6.tar.bz2 tmwa-b2f0d495cd85188e0f9f2d4d363655da40e6e5e6.tar.xz tmwa-b2f0d495cd85188e0f9f2d4d363655da40e6e5e6.zip | |
Have I mentioned that I hate ADL?
Diffstat (limited to 'src/map')
| -rw-r--r-- | src/map/mapflag.cpp | 2 | ||||
| -rw-r--r-- | src/map/mapflag.hpp | 2 | ||||
| -rw-r--r-- | src/map/mob.cpp | 8 | ||||
| -rw-r--r-- | src/map/script-fun.cpp | 1 |
4 files changed, 7 insertions, 6 deletions
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" |