From 1e77f5dc8d95bbf912205c85274d294a80ea65c9 Mon Sep 17 00:00:00 2001
From: Ben Longbons <b.r.longbons@gmail.com>
Date: Sat, 23 Feb 2013 14:28:21 -0800
Subject: Replace struct dbt with typesafe std::map wrappers

Also fix broken save/accreg.txt reading.
---
 src/map/script.hpp | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

(limited to 'src/map/script.hpp')

diff --git a/src/map/script.hpp b/src/map/script.hpp
index e09baf8..352164b 100644
--- a/src/map/script.hpp
+++ b/src/map/script.hpp
@@ -3,6 +3,10 @@
 
 #include <cstdint>
 
+#include <string>
+
+#include "../common/db.hpp"
+
 enum class ScriptCode : uint8_t;
 
 struct script_data
@@ -50,8 +54,10 @@ typedef struct argrec
 int run_script_l(const ScriptCode *, int, int, int, int, argrec_t *args);
 int run_script(const ScriptCode *, int, int, int);
 
-struct dbt *script_get_label_db(void);
-struct dbt *script_get_userfunc_db(void);
+extern
+Map<std::string, int> scriptlabel_db;
+extern
+DMap<std::string, const ScriptCode *> userfunc_db;
 
 void script_config_read();
 void do_init_script(void);
-- 
cgit v1.2.3-60-g2f50