summaryrefslogtreecommitdiff
path: root/src/map/pet.c
diff options
context:
space:
mode:
authorFlavioJS <FlavioJS@54d463be-8e91-2dee-dedb-b68131a5f0ec>2006-12-22 05:27:03 +0000
committerFlavioJS <FlavioJS@54d463be-8e91-2dee-dedb-b68131a5f0ec>2006-12-22 05:27:03 +0000
commit34f200c644ba8598448e20f4aa69a504e55d3c8f (patch)
treea812ecfcfad219d17855da956578b7ad83c88aa2 /src/map/pet.c
parent1d96525d00110de78f02decfd31f106f99ce9c73 (diff)
downloadhercules-34f200c644ba8598448e20f4aa69a504e55d3c8f.tar.gz
hercules-34f200c644ba8598448e20f4aa69a504e55d3c8f.tar.bz2
hercules-34f200c644ba8598448e20f4aa69a504e55d3c8f.tar.xz
hercules-34f200c644ba8598448e20f4aa69a504e55d3c8f.zip
- Change strncpy to memcpy when parsing switches in the script engine since it's guaranteed to be a word of that size (skip_word).
- Made scriptlabel_db duplicate the key. When str_buf is reallocated, the keys in scriptlabel_db could become invalid, causing a crash in npc_convertlabel_db. ( removed the readded >=0x81 equivalent ) - Now npc_convertlabel_db clears scriptlabel_db after using it. - parse_script has an extra parameter options. At the moment it only indicates if scriptlabel_db should be used or not. - Fixed "UINT_MAX undeclared" on systems that don't declare it in limits.h git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@9557 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 035514bd1..50433aab3 100644
--- a/src/map/pet.c
+++ b/src/map/pet.c
@@ -1351,7 +1351,7 @@ int read_petdb()
pet_db[j].script = NULL;
if((np=strchr(p,'{'))==NULL)
continue;
- pet_db[j].script = parse_script((unsigned char *) np, filename[i], lines);
+ pet_db[j].script = parse_script(np, filename[i], lines, 0);
j++;
}
if (j >= MAX_PET_DB)