From 8c51c16bd34c2dd453bafc588e619d0b64ac0276 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/map/map.c | 2 ++ 1 file changed, 2 insertions(+) (limited to 'src/map') 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-70-g09d2 From 66ccb5adb45411adaef7ab45d2dc7fe1741ebdcc Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Mon, 10 Nov 2014 16:00:28 +0300 Subject: Add support for plugin options in map server config (logs.conf). --- src/common/HPMi.h | 3 +++ src/map/log.c | 3 +++ 2 files changed, 6 insertions(+) (limited to 'src/map') diff --git a/src/common/HPMi.h b/src/common/HPMi.h index 850f734ba..10a5ec082 100644 --- a/src/common/HPMi.h +++ b/src/common/HPMi.h @@ -89,6 +89,7 @@ enum HPluginConfType { HPCT_CHAR, /* char-server.conf (char-server) */ HPCT_CHAR_INTER, /* inter-server.conf (char-server) */ HPCT_MAP_INTER, /* inter-server.conf (map-server) */ + HPCT_LOG, /* logs.conf (map-server) */ HPCT_MAX, }; @@ -169,6 +170,8 @@ enum HPluginConfType { #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->addLog */ +#define addLogConf(bcname,funcname) HPMi->addConf(HPMi->pid,HPCT_LOG,bcname,funcname) /* HPMi->addPCGPermission */ #define addGroupPermission(pcgname,maskptr) HPMi->addPCGPermission(HPMi->pid,pcgname,&maskptr) diff --git a/src/map/log.c b/src/map/log.c index 3efcd09df..f0fd6795c 100644 --- a/src/map/log.c +++ b/src/map/log.c @@ -20,6 +20,7 @@ #include "../common/showmsg.h" #include "../common/sql.h" // SQL_INNODB #include "../common/strlib.h" +#include "../common/HPM.h" struct log_interface log_s; @@ -453,6 +454,8 @@ int log_config_read(const char* cfgName) { //support the import command, just like any other config else if( strcmpi(w1,"import") == 0 ) logs->config_read(w2); + else if (HPM->parseConf(w1, w2, HPCT_LOG)) + ; // handled by plugins else ShowWarning("Unknown setting '%s' in file %s\n", w1, cfgName); } -- cgit v1.2.3-70-g09d2 From a74ad535b6c048994bce887134c710676abc2147 Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Mon, 10 Nov 2014 16:16:20 +0300 Subject: Add support for plugin options in map server config (script.conf). --- src/common/HPMi.h | 3 +++ src/map/script.c | 5 ++++- 2 files changed, 7 insertions(+), 1 deletion(-) (limited to 'src/map') diff --git a/src/common/HPMi.h b/src/common/HPMi.h index 10a5ec082..0f2bed10d 100644 --- a/src/common/HPMi.h +++ b/src/common/HPMi.h @@ -90,6 +90,7 @@ enum HPluginConfType { HPCT_CHAR_INTER, /* inter-server.conf (char-server) */ HPCT_MAP_INTER, /* inter-server.conf (map-server) */ HPCT_LOG, /* logs.conf (map-server) */ + HPCT_SCRIPT, /* script.conf (map-server) */ HPCT_MAX, }; @@ -172,6 +173,8 @@ enum HPluginConfType { #define addMapInterConf(bcname,funcname) HPMi->addConf(HPMi->pid,HPCT_MAP_INTER,bcname,funcname) /* HPMi->addLog */ #define addLogConf(bcname,funcname) HPMi->addConf(HPMi->pid,HPCT_LOG,bcname,funcname) +/* HPMi->addScript */ +#define addScriptConf(bcname,funcname) HPMi->addConf(HPMi->pid,HPCT_SCRIPT,bcname,funcname) /* HPMi->addPCGPermission */ #define addGroupPermission(pcgname,maskptr) HPMi->addPCGPermission(HPMi->pid,pcgname,&maskptr) diff --git a/src/map/script.c b/src/map/script.c index 56bccbdec..aa90a5b1c 100644 --- a/src/map/script.c +++ b/src/map/script.c @@ -55,6 +55,7 @@ #include "../common/sysinfo.h" #include "../common/timer.h" #include "../common/utils.h" +#include "../common/HPM.h" #ifndef WIN32 #include @@ -4141,7 +4142,9 @@ int script_config_read(char *cfgName) { else if(strcmpi(w1,"import")==0) { script->config_read(w2); } - else { + else if(HPM->parseConf(w1, w2, HPCT_SCRIPT)) { + ; // handled by plugin + } else { ShowWarning("Unknown setting '%s' in file %s\n", w1, cfgName); } } -- cgit v1.2.3-70-g09d2