From 1e125f7680aa0b7bdcd050e3aec3378e579d0064 Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Mon, 10 Nov 2014 15:41:48 +0300 Subject: Add support for plugin options in map server config (inter-server.conf). --- src/common/HPMi.h | 5 ++++- src/map/map.c | 2 ++ 2 files changed, 6 insertions(+), 1 deletion(-) 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); -- cgit v1.2.3-60-g2f50