From b3112bd3f6d0887fdf81610327c9edad08a0cfaf Mon Sep 17 00:00:00 2001
From: Ben Longbons <b.r.longbons@gmail.com>
Date: Sat, 10 Jan 2015 17:32:49 -0800
Subject: Use generated config for map

---
 src/map/script-fun.cpp | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

(limited to 'src/map/script-fun.cpp')

diff --git a/src/map/script-fun.cpp b/src/map/script-fun.cpp
index 12f8679..b9b581f 100644
--- a/src/map/script-fun.cpp
+++ b/src/map/script-fun.cpp
@@ -41,8 +41,10 @@
 
 #include "atcommand.hpp"
 #include "battle.hpp"
+#include "battle_conf.hpp"
 #include "chrif.hpp"
 #include "clif.hpp"
+#include "globals.hpp"
 #include "intif.hpp"
 #include "itemdb.hpp"
 #include "magic-interpreter-base.hpp"
@@ -62,6 +64,8 @@
 
 namespace tmwa
 {
+namespace map
+{
 static
 Array<LString, 11> pos_str //=
 {{
@@ -2376,7 +2380,7 @@ void builtin_getunactivatedpoolskilllist(ScriptState *st)
     if (!sd)
         return;
 
-    for (i = 0; i < skill_pool_skills_size; i++)
+    for (i = 0; i < skill_pool_skills.size(); i++)
     {
         SkillID skill_id = skill_pool_skills[i];
 
@@ -3093,4 +3097,5 @@ BuiltinFunction builtin_functions[] =
     BUILTIN(mapexit, ""_s, '\0'),
     {nullptr, ""_s, ""_s, '\0'},
 };
+} // namespace map
 } // namespace tmwa
-- 
cgit v1.2.3-70-g09d2