diff options
| author | Ben Longbons <b.r.longbons@gmail.com> | 2013-02-23 14:28:21 -0800 |
|---|---|---|
| committer | Ben Longbons <b.r.longbons@gmail.com> | 2013-02-23 15:13:16 -0800 |
| commit | 1e77f5dc8d95bbf912205c85274d294a80ea65c9 (patch) | |
| tree | 054aa52764297b205431dfe82119a7f3e5e7ecd1 /src/map/script.hpp | |
| parent | 25823b36905a84d92f9299ba7f9f0c713141c8fb (diff) | |
| download | tmwa-1e77f5dc8d95bbf912205c85274d294a80ea65c9.tar.gz tmwa-1e77f5dc8d95bbf912205c85274d294a80ea65c9.tar.bz2 tmwa-1e77f5dc8d95bbf912205c85274d294a80ea65c9.tar.xz tmwa-1e77f5dc8d95bbf912205c85274d294a80ea65c9.zip | |
Replace struct dbt with typesafe std::map wrappers
Also fix broken save/accreg.txt reading.
Diffstat (limited to 'src/map/script.hpp')
| -rw-r--r-- | src/map/script.hpp | 10 |
1 files changed, 8 insertions, 2 deletions
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); |