diff options
Diffstat (limited to 'src/map')
| -rw-r--r-- | src/map/npc.c | 9 | ||||
| -rw-r--r-- | src/map/script.c | 8 |
2 files changed, 10 insertions, 7 deletions
diff --git a/src/map/npc.c b/src/map/npc.c index 2396991d5..3369d6b77 100644 --- a/src/map/npc.c +++ b/src/map/npc.c @@ -29,7 +29,10 @@ #include "memwatch.h" #endif - +#ifdef _WIN32 +#undef isspace +#define isspace(x) (x == ' ' || x == '\t') +#endif struct npc_src_list { struct npc_src_list * next; @@ -1708,11 +1711,11 @@ static int npc_parse_script(char *w1,char *w2,char *w3,char *w4,char *first_line char srcname[128]; struct npc_data *nd2; if( sscanf(w2,"duplicate(%[^)])",srcname)!=1 ){ - printf("bad duplicate name! : %s",w2); + printf("bad duplicate name (in %s)! : %s",current_file, w2); return 0; } if( (nd2=npc_name2id(srcname))==NULL ){ - printf("bad duplicate name! (not exist) : %s\n",srcname); + printf("bad duplicate name (in %s)! (not exist) : %s\n", current_file, srcname); return 0; } script=(unsigned char *)nd2->u.scr.script; diff --git a/src/map/script.c b/src/map/script.c index 8a1672c06..1a0a1d1c1 100644 --- a/src/map/script.c +++ b/src/map/script.c @@ -52,7 +52,7 @@ (t)=conv_num(st,&(st->stack->stack_data[st->start+(n)])); enum { LABEL_NEXTLINE=1,LABEL_START }; -static unsigned char * script_buf; +static unsigned char * script_buf = NULL; static int script_pos,script_size; char *str_buf; @@ -65,7 +65,7 @@ static struct str_data_struct { int (*func)(struct script_state *); int val; int next; -} *str_data; +} *str_data = NULL; int str_num=LABEL_START,str_data_size; int str_hash[16]; @@ -7813,8 +7813,8 @@ int do_final_script() { if(mapreg_dirty>=0) script_save_mapreg(); - if(script_buf) - aFree(script_buf); +// if(script_buf) +// aFree(script_buf); if(mapreg_db) numdb_final(mapreg_db,mapreg_db_final); |