diff options
| author | Haru <haru@dotalux.com> | 2016-02-20 14:43:20 +0100 |
|---|---|---|
| committer | Haru <haru@dotalux.com> | 2016-03-20 18:32:08 +0100 |
| commit | 9975335df7aa30d687bf47aa1fe01f0c4993849d (patch) | |
| tree | e8dde5f5aa2d5fdc12d1e91b6a42a2a3e8b7513c /src/map/script.c | |
| parent | 13dcf1e6c32b672e72f70a6cdbb42b4c3a2df3d8 (diff) | |
| download | hercules-9975335df7aa30d687bf47aa1fe01f0c4993849d.tar.gz hercules-9975335df7aa30d687bf47aa1fe01f0c4993849d.tar.bz2 hercules-9975335df7aa30d687bf47aa1fe01f0c4993849d.tar.xz hercules-9975335df7aa30d687bf47aa1fe01f0c4993849d.zip | |
Dropped typedef from DBIterator
Signed-off-by: Haru <haru@dotalux.com>
Diffstat (limited to 'src/map/script.c')
| -rw-r--r-- | src/map/script.c | 25 |
1 files changed, 14 insertions, 11 deletions
diff --git a/src/map/script.c b/src/map/script.c index bb6651ca5..5d7698f75 100644 --- a/src/map/script.c +++ b/src/map/script.c @@ -4261,8 +4261,9 @@ void run_script(struct script_code *rootscript, int pos, int rid, int oid) { script->run_main(st); } -void script_stop_instances(struct script_code *code) { - DBIterator *iter; +void script_stop_instances(struct script_code *code) +{ + struct DBIterator *iter; struct script_state* st; if( !script->active_scripts ) @@ -4723,9 +4724,10 @@ void script_generic_ui_array_expand (unsigned int plus) { /*========================================== * Destructor *------------------------------------------*/ -void do_final_script(void) { +void do_final_script(void) +{ int i; - DBIterator *iter; + struct DBIterator *iter; struct script_state *st; #ifdef SCRIPT_DEBUG_HASH @@ -4916,8 +4918,7 @@ void script_load_translations(void) { libconfig->destroy(&translations_conf); if( total ) { - DBIterator *main_iter; - DBIterator *sub_iter; + struct DBIterator *main_iter, *sub_iter; DBMap *string_db; struct string_translation *st = NULL; uint32 j = 0; @@ -5138,7 +5139,7 @@ int script_translation_db_destroyer(union DBKey key, struct DBData *data, va_lis if( db_size(string_db) ) { struct string_translation *st = NULL; - DBIterator *iter = db_iterator(string_db); + struct DBIterator *iter = db_iterator(string_db); for( st = dbi_first(iter); dbi_exists(iter); st = dbi_next(iter) ) { aFree(st); @@ -5218,9 +5219,10 @@ void do_init_script(bool minimal) { script->load_translations(); } -int script_reload(void) { +int script_reload(void) +{ int i; - DBIterator *iter; + struct DBIterator *iter; struct script_state *st; #ifdef ENABLE_CASE_CHECK @@ -16995,8 +16997,9 @@ BUILDIN(sleep2) { /// Awakes all the sleep timers of the target npc /// /// awake "<npc name>"; -BUILDIN(awake) { - DBIterator *iter; +BUILDIN(awake) +{ + struct DBIterator *iter; struct script_state *tst; struct npc_data* nd; |