summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2014-11-10 15:41:48 +0300
committerAndrei Karas <akaras@inbox.ru>2014-11-15 19:08:35 +0300
commit1e125f7680aa0b7bdcd050e3aec3378e579d0064 (patch)
tree920fda5472992cb563275417e2ddc1b0ffa59594
parent8c1c2d1a6c8557dfcce27a37f9c7a7bbef82d7a0 (diff)
downloadhercules-1e125f7680aa0b7bdcd050e3aec3378e579d0064.tar.gz
hercules-1e125f7680aa0b7bdcd050e3aec3378e579d0064.tar.bz2
hercules-1e125f7680aa0b7bdcd050e3aec3378e579d0064.tar.xz
hercules-1e125f7680aa0b7bdcd050e3aec3378e579d0064.zip
Add support for plugin options in map server config (inter-server.conf).
-rw-r--r--src/common/HPMi.h5
-rw-r--r--src/map/map.c2
2 files changed, 6 insertions, 1 deletions
diff --git a/src/common/HPMi.h b/src/common/HPMi.h
index 945f0fec1..850f734ba 100644
--- a/src/common/HPMi.h
+++ b/src/common/HPMi.h
@@ -88,6 +88,7 @@ enum HPluginConfType {
HPCT_LOGIN, /* login-server.conf (login-server) */
HPCT_CHAR, /* char-server.conf (char-server) */
HPCT_CHAR_INTER, /* inter-server.conf (char-server) */
+ HPCT_MAP_INTER, /* inter-server.conf (map-server) */
HPCT_MAX,
};
@@ -165,7 +166,9 @@ enum HPluginConfType {
/* HPMi->addChar */
#define addCharConf(bcname,funcname) HPMi->addConf(HPMi->pid,HPCT_CHAR,bcname,funcname)
/* HPMi->addCharInter */
-#define addCharInterConf(bcname,funcname) HPMi->addConf(HPMi->pid,HPCT_SQL,bcname,funcname)
+#define addCharInterConf(bcname,funcname) HPMi->addConf(HPMi->pid,HPCT_CHAR_INTER,bcname,funcname)
+/* HPMi->addMapInter */
+#define addMapInterConf(bcname,funcname) HPMi->addConf(HPMi->pid,HPCT_MAP_INTER,bcname,funcname)
/* HPMi->addPCGPermission */
#define addGroupPermission(pcgname,maskptr) HPMi->addPCGPermission(HPMi->pid,pcgname,&maskptr)
diff --git a/src/map/map.c b/src/map/map.c
index 5c0f5d65e..9e2727b07 100644
--- a/src/map/map.c
+++ b/src/map/map.c
@@ -3780,6 +3780,8 @@ int inter_config_read(char *cfgName) {
/* import */
else if(strcmpi(w1,"import")==0)
map->inter_config_read(w2);
+ else
+ HPM->parseConf(w1, w2, HPCT_MAP_INTER);
}
fclose(fp);