Follow up r16403, adjusted map_reloadnpcs to follow new config standards(r16382).
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@16404 54d463be-8e91-2dee-dedb-b68131a5f0ec
This commit is contained in:
parent
8d8baccf71
commit
4ad7e62105
@ -3949,7 +3949,7 @@ ACMD_FUNC(reloadscript)
|
|||||||
//atcommand_broadcast( fd, sd, "@broadcast", "You will feel a bit of lag at this point !" );
|
//atcommand_broadcast( fd, sd, "@broadcast", "You will feel a bit of lag at this point !" );
|
||||||
|
|
||||||
flush_fifos();
|
flush_fifos();
|
||||||
map_reloadnpc(); // reload config files seeking for npcs
|
map_reloadnpc(true); // reload config files seeking for npcs
|
||||||
script_reload();
|
script_reload();
|
||||||
npc_reload();
|
npc_reload();
|
||||||
|
|
||||||
|
@ -3378,10 +3378,16 @@ void map_reloadnpc_sub(char *cfgName)
|
|||||||
fclose(fp);
|
fclose(fp);
|
||||||
}
|
}
|
||||||
|
|
||||||
void map_reloadnpc()
|
void map_reloadnpc(bool clear)
|
||||||
{
|
{
|
||||||
|
if (clear)
|
||||||
npc_addsrcfile("clear"); // this will clear the current script list
|
npc_addsrcfile("clear"); // this will clear the current script list
|
||||||
map_reloadnpc_sub(MAP_CONF_NAME);
|
|
||||||
|
#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)
|
int inter_config_read(char *cfgName)
|
||||||
@ -3888,11 +3894,8 @@ int do_init(int argc, char *argv[])
|
|||||||
map_config_read(MAP_CONF_NAME);
|
map_config_read(MAP_CONF_NAME);
|
||||||
/* only temporary until sirius's datapack patch is complete */
|
/* only temporary until sirius's datapack patch is complete */
|
||||||
|
|
||||||
#ifdef RENEWAL
|
// loads npcs
|
||||||
map_config_read("npc/re/scripts_main.conf");
|
map_reloadnpc(false);
|
||||||
#else
|
|
||||||
map_config_read("npc/pre-re/scripts_main.conf");
|
|
||||||
#endif
|
|
||||||
|
|
||||||
chrif_checkdefaultlogin();
|
chrif_checkdefaultlogin();
|
||||||
|
|
||||||
|
@ -682,7 +682,7 @@ struct mob_data * map_getmob_boss(int m);
|
|||||||
struct mob_data * map_id2boss(int id);
|
struct mob_data * map_id2boss(int id);
|
||||||
|
|
||||||
// reload config file looking only for npcs
|
// reload config file looking only for npcs
|
||||||
void map_reloadnpc();
|
void map_reloadnpc(bool clear);
|
||||||
|
|
||||||
/// Bitfield of flags for the iterator.
|
/// Bitfield of flags for the iterator.
|
||||||
enum e_mapitflags
|
enum e_mapitflags
|
||||||
|
Loading…
x
Reference in New Issue
Block a user