summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorgreenboxal2 <greenboxal2@54d463be-8e91-2dee-dedb-b68131a5f0ec>2012-07-11 22:07:39 +0000
committergreenboxal2 <greenboxal2@54d463be-8e91-2dee-dedb-b68131a5f0ec>2012-07-11 22:07:39 +0000
commit3ec480937ea4f48e37762d93fadb7909f31eea83 (patch)
tree6ec6f169c5bab16652d2f03311e87ae1a1b45041
parent665602e6e9eb89f6bf87e15473c2a42974b7cce1 (diff)
downloadhercules-3ec480937ea4f48e37762d93fadb7909f31eea83.tar.gz
hercules-3ec480937ea4f48e37762d93fadb7909f31eea83.tar.bz2
hercules-3ec480937ea4f48e37762d93fadb7909f31eea83.tar.xz
hercules-3ec480937ea4f48e37762d93fadb7909f31eea83.zip
Fixed bugreport:6187 @reloadscript now reload map config files seeking for npcs.
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@16403 54d463be-8e91-2dee-dedb-b68131a5f0ec
-rw-r--r--src/map/atcommand.c1
-rw-r--r--src/map/map.c46
-rw-r--r--src/map/map.h3
3 files changed, 50 insertions, 0 deletions
diff --git a/src/map/atcommand.c b/src/map/atcommand.c
index 0bf57ea52..df034f9ad 100644
--- a/src/map/atcommand.c
+++ b/src/map/atcommand.c
@@ -3949,6 +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
script_reload();
npc_reload();
diff --git a/src/map/map.c b/src/map/map.c
index de71d0e84..9a5350e2d 100644
--- a/src/map/map.c
+++ b/src/map/map.c
@@ -3338,6 +3338,52 @@ int map_config_read(char *cfgName)
return 0;
}
+void map_reloadnpc_sub(char *cfgName)
+{
+ char line[1024], w1[1024], w2[1024];
+ FILE *fp;
+
+ fp = fopen(cfgName,"r");
+ if( fp == NULL )
+ {
+ ShowError("Map configuration file not found at: %s\n", cfgName);
+ return;
+ }
+
+ while( fgets(line, sizeof(line), fp) )
+ {
+ char* ptr;
+
+ if( line[0] == '/' && line[1] == '/' )
+ continue;
+ if( (ptr = strstr(line, "//")) != NULL )
+ *ptr = '\n'; //Strip comments
+ if( sscanf(line, "%[^:]: %[^\t\r\n]", w1, w2) < 2 )
+ continue;
+
+ //Strip trailing spaces
+ ptr = w2 + strlen(w2);
+ while (--ptr >= w2 && *ptr == ' ');
+ ptr++;
+ *ptr = '\0';
+
+ if (strcmpi(w1, "npc") == 0)
+ npc_addsrcfile(w2);
+ else if (strcmpi(w1, "import") == 0)
+ map_reloadnpc_sub(w2);
+ else
+ ShowWarning("Unknown setting '%s' in file %s\n", w1, cfgName);
+ }
+
+ fclose(fp);
+}
+
+void map_reloadnpc()
+{
+ npc_addsrcfile("clear"); // this will clear the current script list
+ map_reloadnpc_sub(MAP_CONF_NAME);
+}
+
int inter_config_read(char *cfgName)
{
char line[1024],w1[1024],w2[1024];
diff --git a/src/map/map.h b/src/map/map.h
index fd13bf467..342c8723f 100644
--- a/src/map/map.h
+++ b/src/map/map.h
@@ -681,6 +681,9 @@ struct map_session_data * map_nick2sd(const char*);
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();
+
/// Bitfield of flags for the iterator.
enum e_mapitflags
{