diff options
author | Haru <haru@dotalux.com> | 2014-05-09 07:37:53 +0200 |
---|---|---|
committer | Haru <haru@dotalux.com> | 2014-05-09 07:40:43 +0200 |
commit | 5f1529083ad1f35a3ac66cc041ee74d6db2f3552 (patch) | |
tree | 32c4d73a7f68cd7a1a963e14e3972333758bb541 /src/map/map.c | |
parent | 581ff22b9bad7567a27980df31636f0c75ba5fc2 (diff) | |
download | hercules-5f1529083ad1f35a3ac66cc041ee74d6db2f3552.tar.gz hercules-5f1529083ad1f35a3ac66cc041ee74d6db2f3552.tar.bz2 hercules-5f1529083ad1f35a3ac66cc041ee74d6db2f3552.tar.xz hercules-5f1529083ad1f35a3ac66cc041ee74d6db2f3552.zip |
Return EXIT_FAILURE if a script parse error occurred.
- This affects normal execution as well as ./script-checker runs.
Signed-off-by: Haru <haru@dotalux.com>
Diffstat (limited to 'src/map/map.c')
-rw-r--r-- | src/map/map.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/map/map.c b/src/map/map.c index a5ec6d83b..24a07699f 100644 --- a/src/map/map.c +++ b/src/map/map.c @@ -3841,7 +3841,7 @@ void map_zone_remove(int m) { } } - npc->parse_mapflag(map->list[m].name,empty,flag,params,empty,empty,empty); + npc->parse_mapflag(map->list[m].name,empty,flag,params,empty,empty,empty, NULL); aFree(map->list[m].zone_mf[k]); map->list[m].zone_mf[k] = NULL; } @@ -4573,7 +4573,7 @@ void map_zone_apply(int m, struct map_zone_data *zone, const char* start, const if( map->zone_mf_cache(m,flag,params) ) continue; - npc->parse_mapflag(map->list[m].name,empty,flag,params,start,buffer,filepath); + npc->parse_mapflag(map->list[m].name, empty, flag, params, start, buffer, filepath, NULL); } } /* used on npc load and reload to apply all "Normal" and "PK Mode" zones */ @@ -4601,7 +4601,7 @@ void map_zone_init(void) { if( map->list[j].zone == zone ) { if( map->zone_mf_cache(j,flag,params) ) break; - npc->parse_mapflag(map->list[j].name,empty,flag,params,empty,empty,empty); + npc->parse_mapflag(map->list[j].name, empty, flag, params, empty, empty, empty, NULL); } } } @@ -4623,7 +4623,7 @@ void map_zone_init(void) { if( map->list[j].zone == zone ) { if( map->zone_mf_cache(j,flag,params) ) break; - npc->parse_mapflag(map->list[j].name,empty,flag,params,empty,empty,empty); + npc->parse_mapflag(map->list[j].name, empty, flag, params, empty, empty, empty, NULL); } } } @@ -5810,7 +5810,7 @@ int do_init(int argc, char *argv[]) if (scriptcheck) { bool failed = load_extras_count > 0 ? false : true; for (i = 0; i < load_extras_count; i++) { - if (npc->parsesrcfile(load_extras[i], false) != 0) + if (npc->parsesrcfile(load_extras[i], false) != EXIT_SUCCESS) failed = true; } if (failed) |