summaryrefslogtreecommitdiff
path: root/src/map/npc.c
diff options
context:
space:
mode:
authormc_cameri <mc_cameri@54d463be-8e91-2dee-dedb-b68131a5f0ec>2004-12-21 22:44:37 +0000
committermc_cameri <mc_cameri@54d463be-8e91-2dee-dedb-b68131a5f0ec>2004-12-21 22:44:37 +0000
commit98c2c3c621f32fdf36f23cfd09565f8af7753e7d (patch)
tree690421a25fb99ba752bcad32621efa2aed3830b1 /src/map/npc.c
parentf58657930161cc0dc3f1f74d0c0ed99c6a0c8829 (diff)
downloadhercules-98c2c3c621f32fdf36f23cfd09565f8af7753e7d.tar.gz
hercules-98c2c3c621f32fdf36f23cfd09565f8af7753e7d.tar.bz2
hercules-98c2c3c621f32fdf36f23cfd09565f8af7753e7d.tar.xz
hercules-98c2c3c621f32fdf36f23cfd09565f8af7753e7d.zip
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/branches/stable@714 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src/map/npc.c')
-rw-r--r--src/map/npc.c9
1 files changed, 7 insertions, 2 deletions
diff --git a/src/map/npc.c b/src/map/npc.c
index 43b97b055..4a7704740 100644
--- a/src/map/npc.c
+++ b/src/map/npc.c
@@ -1605,7 +1605,12 @@ static int npc_parse_script(char *w1,char *w2,char *w3,char *w4,char *first_line
// 引数の個数チェック
if (sscanf(w1,"%[^,],%d,%d,%d",mapname,&x,&y,&dir) != 4 ||
( strcmp(w2,"script")==0 && strchr(w4,',')==NULL) ) {
- printf("bad script line : %s\n",w3);
+ if (strlen(current_file)) {
+ printf("\n");
+ sprintf(tmp_output,"Bad script on line '"CL_WHITE"%s"CL_RESET"' fro"
+ "m file '"CL_WHITE"%s"CL_RESET"'.\n",w3,current_file);
+ ShowError(tmp_output);
+ }
return 1;
}
m = map_mapname2mapid(mapname);
@@ -2411,7 +2416,7 @@ int do_init_npc(void)
add_timer_func_list(npc_event_timer,"npc_event_timer");
add_timer_func_list(npc_event_do_clock,"npc_event_do_clock");
add_timer_func_list(npc_timerevent,"npc_timerevent");
-
+ memset(current_file,'\0',sizeof(current_file));
//exit(1);
return 0;