diff options
| author | greenboxal2 <greenboxal2@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2012-07-11 22:37:41 +0000 |
|---|---|---|
| committer | greenboxal2 <greenboxal2@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2012-07-11 22:37:41 +0000 |
| commit | c7ca0a3ce5982cc83043cdf3f9cd30f391c77b02 (patch) | |
| tree | ef95f0ef7444a31ecb775ba108f2764fea8e37d9 | |
| parent | 3ec480937ea4f48e37762d93fadb7909f31eea83 (diff) | |
| download | hercules-c7ca0a3ce5982cc83043cdf3f9cd30f391c77b02.tar.gz hercules-c7ca0a3ce5982cc83043cdf3f9cd30f391c77b02.tar.bz2 hercules-c7ca0a3ce5982cc83043cdf3f9cd30f391c77b02.tar.xz hercules-c7ca0a3ce5982cc83043cdf3f9cd30f391c77b02.zip | |
Follow up r16403, adjusted map_reloadnpcs to follow new config standards(r16382).
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@16404 54d463be-8e91-2dee-dedb-b68131a5f0ec
| -rw-r--r-- | src/map/atcommand.c | 2 | ||||
| -rw-r--r-- | src/map/map.c | 19 | ||||
| -rw-r--r-- | src/map/map.h | 2 |
3 files changed, 13 insertions, 10 deletions
diff --git a/src/map/atcommand.c b/src/map/atcommand.c index df034f9ad..a600fec63 100644 --- a/src/map/atcommand.c +++ b/src/map/atcommand.c @@ -3949,7 +3949,7 @@ ACMD_FUNC(reloadscript) //atcommand_broadcast( fd, sd, "@broadcast", "You will feel a bit of lag at this point !" ); flush_fifos(); - map_reloadnpc(); // reload config files seeking for npcs + map_reloadnpc(true); // reload config files seeking for npcs script_reload(); npc_reload(); diff --git a/src/map/map.c b/src/map/map.c index 9a5350e2d..37a8eab5d 100644 --- a/src/map/map.c +++ b/src/map/map.c @@ -3378,10 +3378,16 @@ void map_reloadnpc_sub(char *cfgName) fclose(fp); } -void map_reloadnpc() +void map_reloadnpc(bool clear) { - npc_addsrcfile("clear"); // this will clear the current script list - map_reloadnpc_sub(MAP_CONF_NAME); + if (clear) + npc_addsrcfile("clear"); // this will clear the current script list + +#ifdef RENEWAL + map_reloadnpc_sub("npc/re/scripts_main.conf"); +#else + map_reloadnpc_sub("npc/pre-re/scripts_main.conf"); +#endif } int inter_config_read(char *cfgName) @@ -3888,11 +3894,8 @@ int do_init(int argc, char *argv[]) map_config_read(MAP_CONF_NAME); /* only temporary until sirius's datapack patch is complete */ -#ifdef RENEWAL - map_config_read("npc/re/scripts_main.conf"); -#else - map_config_read("npc/pre-re/scripts_main.conf"); -#endif + // loads npcs + map_reloadnpc(false); chrif_checkdefaultlogin(); diff --git a/src/map/map.h b/src/map/map.h index 342c8723f..bb7a99432 100644 --- a/src/map/map.h +++ b/src/map/map.h @@ -682,7 +682,7 @@ struct mob_data * map_getmob_boss(int m); struct mob_data * map_id2boss(int id); // reload config file looking only for npcs -void map_reloadnpc(); +void map_reloadnpc(bool clear); /// Bitfield of flags for the iterator. enum e_mapitflags |