summaryrefslogtreecommitdiff
path: root/src/map/pet.c
diff options
context:
space:
mode:
authorskotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec>2006-07-27 21:00:19 +0000
committerskotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec>2006-07-27 21:00:19 +0000
commit6384f1dd85e311f1456351388f9a94a32ac1fad4 (patch)
tree19209d56704842750a50114e386b8e5490df73ca /src/map/pet.c
parent3e29ca7edd4e8618fa24e6a2c65e35a3baeddad8 (diff)
downloadhercules-6384f1dd85e311f1456351388f9a94a32ac1fad4.tar.gz
hercules-6384f1dd85e311f1456351388f9a94a32ac1fad4.tar.bz2
hercules-6384f1dd85e311f1456351388f9a94a32ac1fad4.tar.xz
hercules-6384f1dd85e311f1456351388f9a94a32ac1fad4.zip
- Synced the script.c file with as much data as possible from jA's:
- A lot of functions were moved around, a bunch of indentation and space-usage changes were done to make it easier to diff against their files. - Miscellanous addition and corrections were applied. - Largest one is likely a restructuring of run_script_main, which hopes to solve the memory leaks. - script engine now uses the setjmp functions to restore memory state when there's an error parsing scripts, which means that script errors won't cause the map-server to inmediately bail out anymore. git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@7926 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src/map/pet.c')
-rw-r--r--src/map/pet.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/map/pet.c b/src/map/pet.c
index 317145cb7..bb9e26dbc 100644
--- a/src/map/pet.c
+++ b/src/map/pet.c
@@ -1352,7 +1352,7 @@ int read_petdb()
pet_db[j].script = NULL;
if((np=strchr(p,'{'))==NULL)
continue;
- pet_db[j].script = parse_script((unsigned char *) np,lines);
+ pet_db[j].script = parse_script((unsigned char *) np, filename[i], lines);
j++;
}
if (j >= MAX_PET_DB)