summaryrefslogtreecommitdiff
path: root/src/map/script.c
diff options
context:
space:
mode:
authorFlavioJS <FlavioJS@54d463be-8e91-2dee-dedb-b68131a5f0ec>2007-04-09 20:21:17 +0000
committerFlavioJS <FlavioJS@54d463be-8e91-2dee-dedb-b68131a5f0ec>2007-04-09 20:21:17 +0000
commite0a18f0853dd7a0cf0533ae0d10da9d19b116767 (patch)
tree2f0adc6661ce4597106033a18e33d8e774a76459 /src/map/script.c
parentfaf6d705ec5b1f8a95a06d31635704adefcca99b (diff)
downloadhercules-e0a18f0853dd7a0cf0533ae0d10da9d19b116767.tar.gz
hercules-e0a18f0853dd7a0cf0533ae0d10da9d19b116767.tar.bz2
hercules-e0a18f0853dd7a0cf0533ae0d10da9d19b116767.tar.xz
hercules-e0a18f0853dd7a0cf0533ae0d10da9d19b116767.zip
* Recoded and renamed the trim function in strlib to normalize_name. (didn't behave like a standard trim function, see function comment for what it does)
* Added a proper trim function to strlib. * Other minor cleanups. git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@10199 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src/map/script.c')
-rw-r--r--src/map/script.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/map/script.c b/src/map/script.c
index afa7146b0..f0d491176 100644
--- a/src/map/script.c
+++ b/src/map/script.c
@@ -22,7 +22,6 @@
#include "itemdb.h"
#include "pc.h"
#include "status.h"
-#include "script.h"
#include "storage.h"
#include "mob.h"
#include "npc.h"
@@ -40,6 +39,7 @@
#include "unit.h"
#include "irc.h"
#include "pet.h"
+#include "script.h"
#include <stdio.h>
#include <stdlib.h>
@@ -346,7 +346,7 @@ static void check_event(struct script_state *st, const char *evt)
* 文字列のハッシュを計算
*------------------------------------------
*/
-#define calc_hash(x) calc_hash2(x)%SCRIPT_HASH_SIZE
+#define calc_hash(x) (calc_hash2(x)%SCRIPT_HASH_SIZE)
static unsigned int calc_hash2(const unsigned char *p)
{
#if defined(SCRIPT_HASH_DJB2)