summaryrefslogtreecommitdiff
path: root/src/map/script.c
diff options
context:
space:
mode:
authorshennetsind <ind@henn.et>2015-03-14 23:19:27 -0300
committershennetsind <ind@henn.et>2015-03-14 23:19:27 -0300
commitf88c46bbaf31108374b22e06b723d66036895249 (patch)
tree09258b690edd15638a08a311fff8598090202a6a /src/map/script.c
parent8aee60e91807930e4d43965a20c8991b416d7f29 (diff)
parentfb1a845c719976f72f2dfb590f72fe3e87e01185 (diff)
downloadhercules-f88c46bbaf31108374b22e06b723d66036895249.tar.gz
hercules-f88c46bbaf31108374b22e06b723d66036895249.tar.bz2
hercules-f88c46bbaf31108374b22e06b723d66036895249.tar.xz
hercules-f88c46bbaf31108374b22e06b723d66036895249.zip
Merge branch 'master' of github.com:HerculesWS/Hercules
Diffstat (limited to 'src/map/script.c')
-rw-r--r--src/map/script.c14
1 files changed, 6 insertions, 8 deletions
diff --git a/src/map/script.c b/src/map/script.c
index 235b7b8d5..39f8a7b63 100644
--- a/src/map/script.c
+++ b/src/map/script.c
@@ -3387,15 +3387,13 @@ void script_free_code(struct script_code* code)
{
nullpo_retv(code);
- if( code->instances )
+ if (code->instances)
script->stop_instances(code);
- else {
- script->free_vars(code->local.vars);
- if( code->local.arrays )
- code->local.arrays->destroy(code->local.arrays,script->array_free_db);
- }
- aFree( code->script_buf );
- aFree( code );
+ script->free_vars(code->local.vars);
+ if (code->local.arrays)
+ code->local.arrays->destroy(code->local.arrays,script->array_free_db);
+ aFree(code->script_buf);
+ aFree(code);
}
/// Creates a new script state.