summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLance <Lance@54d463be-8e91-2dee-dedb-b68131a5f0ec>2006-06-29 08:55:12 +0000
committerLance <Lance@54d463be-8e91-2dee-dedb-b68131a5f0ec>2006-06-29 08:55:12 +0000
commit5127da3ce974eb29d45391b38d2678764b55cc8c (patch)
tree8e7ad97c177ce0e35527388305d188268500675c
parent2004b3f84b57a26444b7555034485d8eb4ce99d0 (diff)
downloadhercules-5127da3ce974eb29d45391b38d2678764b55cc8c.tar.gz
hercules-5127da3ce974eb29d45391b38d2678764b55cc8c.tar.bz2
hercules-5127da3ce974eb29d45391b38d2678764b55cc8c.tar.xz
hercules-5127da3ce974eb29d45391b38d2678764b55cc8c.zip
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@7390 54d463be-8e91-2dee-dedb-b68131a5f0ec
-rw-r--r--src/map/script.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/src/map/script.c b/src/map/script.c
index 2db84fafb..208a91cf8 100644
--- a/src/map/script.c
+++ b/src/map/script.c
@@ -11595,16 +11595,15 @@ void run_script(struct script_code *rootscript,int pos,int rid,int oid)
//struct script_code *bck_script = NULL;
//struct script_code *bck_scriptroot = NULL;
//int bck_scriptstate = 0,bck_npcid = 0;
- struct script_stack *bck_stack = NULL;
+ //struct script_stack *bck_stack = NULL;
if (rootscript == NULL || pos < 0)
return;
- st = aCalloc(sizeof(struct script_state), 1);
-
if ((sd = map_id2sd(rid)) && sd->st && sd->st->scriptroot == rootscript && sd->st->pos == pos){
st = sd->st;
} else {
+ st = aCalloc(sizeof(struct script_state), 1);
// the script is different, make new script_state and stack
st->stack = aMalloc (sizeof(struct script_stack));
st->stack->sp = 0;