Merge pull request #1 from HerculesWS/master

Update from original

1 files changed, 139 insertions, 22 deletions

diff --git a/src/common/HPMi.h b/src/common/HPMi.h
index 3cdb804e0..478cfbdd9 100644
--- a/src/common/HPMi.h
+++ b/src/common/HPMi.h
@@ -1,16 +1,18 @@
 // Copyright (c) Hercules Dev Team, licensed under GNU GPL.
 // See the LICENSE file
 
-#ifndef	_HPMi_H_
-#define _HPMi_H_
+#ifndef COMMON_HPMI_H
+#define COMMON_HPMI_H
 
 #include "../common/cbasetypes.h"
-#include "../common/core.h"
 #include "../common/console.h"
+#include "../common/core.h"
 #include "../common/sql.h"
 
 struct script_state;
 struct AtCommandInfo;
+struct socket_data;
+struct map_session_data;
 
 #ifdef WIN32
 	#define HPExport __declspec(dllexport)
@@ -18,22 +20,11 @@ struct AtCommandInfo;
 	#define HPExport
 #endif
 
-#ifndef _SHOWMSG_H_
-	HPExport void (*ShowMessage) (const char *, ...);
-	HPExport void (*ShowStatus) (const char *, ...);
-	HPExport void (*ShowSQL) (const char *, ...);
-	HPExport void (*ShowInfo) (const char *, ...);
-	HPExport void (*ShowNotice) (const char *, ...);
-	HPExport void (*ShowWarning) (const char *, ...);
-	HPExport void (*ShowDebug) (const char *, ...);
-	HPExport void (*ShowError) (const char *, ...);
-	HPExport void (*ShowFatalError) (const char *, ...);
-#endif
-
 /* after */
 #include "../common/showmsg.h"
 
-#define HPM_VERSION "0.1"
+#define HPM_VERSION "1.0"
+#define HPM_ADDCONF_LENGTH 40
 
 struct hplugin_info {
 	char* name;
@@ -42,29 +33,155 @@ struct hplugin_info {
 	char* req_version;
 };
 
-HPExport void *(*import_symbol) (char *name);
+struct s_HPMDataCheck {
+	char *name;
+	unsigned int size;
+};
+
+HPExport void *(*import_symbol) (char *name, unsigned int pID);
 HPExport Sql *mysql_handle;
 
-#define GET_SYMBOL(n) import_symbol(n)
+#define GET_SYMBOL(n) import_symbol((n),HPMi->pid)
 
-#define SERVER_TYPE_ALL SERVER_TYPE_LOGIN|SERVER_TYPE_CHAR|SERVER_TYPE_MAP
+#define SERVER_TYPE_ALL (SERVER_TYPE_LOGIN|SERVER_TYPE_CHAR|SERVER_TYPE_MAP)
 
 enum hp_event_types {
 	HPET_INIT,/* server starts */
 	HPET_FINAL,/* server is shutting down */
 	HPET_READY,/* server is ready (online) */
+	HPET_POST_FINAL,/* server is done shutting down */
+	HPET_PRE_INIT,/* server is about to start (used to e.g. add custom "--args" handling) */
 	HPET_MAX,
 };
 
+enum HPluginPacketHookingPoints {
+	hpClif_Parse,      ///< map-server (client-map)
+	hpChrif_Parse,     ///< map-server (char-map)
+	hpParse_FromMap,   ///< char-server (map-char)
+	hpParse_FromLogin, ///< char-server (login-char)
+	hpParse_Char,      ///< char-server (client-char)
+	hpParse_FromChar,  ///< login-server (char-login)
+	hpParse_Login,     ///< login-server (client-login)
+	/* */
+	hpPHP_MAX,
+};
+
+enum HPluginHookType {
+	HOOK_TYPE_PRE,
+	HOOK_TYPE_POST,
+};
+
+enum HPluginDataTypes {
+	HPDT_SESSION,
+	HPDT_MSD,
+	HPDT_NPCD,
+	HPDT_MAP,
+	HPDT_INSTANCE,
+	HPDT_GUILD,
+	HPDT_PARTY,
+};
+
+/* used in macros and conf storage */
+enum HPluginConfType {
+	HPCT_BATTLE, /* battle-conf (map-server */
+	HPCT_MAX,
+};
+
+#define addHookPre(tname,hook) (HPMi->AddHook(HOOK_TYPE_PRE,(tname),(hook),HPMi->pid))
+#define addHookPost(tname,hook) (HPMi->AddHook(HOOK_TYPE_POST,(tname),(hook),HPMi->pid))
+/* need better names ;/ */
+/* will not run the original function after pre-hook processing is complete (other hooks will run) */
+#define hookStop() (HPMi->HookStop(__func__,HPMi->pid))
+#define hookStopped() (HPMi->HookStopped())
+
+#define addArg(name,param,func,help) (HPMi->addArg(HPMi->pid,(name),(param),(func),(help)))
+/* HPData handy redirects */
+/* session[] */
+#define addToSession(ptr,data,index,autofree) (HPMi->addToHPData(HPDT_SESSION,HPMi->pid,(ptr),(data),(index),(autofree)))
+#define getFromSession(ptr,index) (HPMi->getFromHPData(HPDT_SESSION,HPMi->pid,(ptr),(index)))
+#define removeFromSession(ptr,index) (HPMi->removeFromHPData(HPDT_SESSION,HPMi->pid,(ptr),(index)))
+/* map_session_data */
+#define addToMSD(ptr,data,index,autofree) (HPMi->addToHPData(HPDT_MSD,HPMi->pid,(ptr),(data),(index),(autofree)))
+#define getFromMSD(ptr,index) (HPMi->getFromHPData(HPDT_MSD,HPMi->pid,(ptr),(index)))
+#define removeFromMSD(ptr,index) (HPMi->removeFromHPData(HPDT_MSD,HPMi->pid,(ptr),(index)))
+/* npc_data */
+#define addToNPCD(ptr,data,index,autofree) (HPMi->addToHPData(HPDT_NPCD,HPMi->pid,(ptr),(data),(index),(autofree)))
+#define getFromNPCD(ptr,index) (HPMi->getFromHPData(HPDT_NPCD,HPMi->pid,(ptr),(index)))
+#define removeFromNPCD(ptr,index) (HPMi->removeFromHPData(HPDT_NPCD,HPMi->pid,(ptr),(index)))
+/* map_data */
+#define addToMAPD(ptr,data,index,autofree) (HPMi->addToHPData(HPDT_MAP,HPMi->pid,(ptr),(data),(index),(autofree)))
+#define getFromMAPD(ptr,index) (HPMi->getFromHPData(HPDT_MAP,HPMi->pid,(ptr),(index)))
+#define removeFromMAPD(ptr,index) (HPMi->removeFromHPData(HPDT_MAP,HPMi->pid,(ptr),(index)))
+/* party_data */
+#define addToPAD(ptr,data,index,autofree) (HPMi->addToHPData(HPDT_PARTY,HPMi->pid,(ptr),(data),(index),(autofree)))
+#define getFromPAD(ptr,index) (HPMi->getFromHPData(HPDT_PARTY,HPMi->pid,(ptr),(index)))
+#define removeFromPAD(ptr,index) (HPMi->removeFromHPData(HPDT_PARTY,HPMi->pid,(ptr),(index)))
+/* guild */
+#define addToGLD(ptr,data,index,autofree) (HPMi->addToHPData(HPDT_GUILD,HPMi->pid,(ptr),(data),(index),(autofree)))
+#define getFromGLD(ptr,index) (HPMi->getFromHPData(HPDT_GUILD,HPMi->pid,(ptr),(index)))
+#define removeFromGLD(ptr,index) (HPMi->removeFromHPData(HPDT_GUILD,HPMi->pid,(ptr),(index)))
+/* instance_data */
+#define addToINSTD(ptr,data,index,autofree) (HPMi->addToHPData(HPDT_INSTANCE,HPMi->pid,(ptr),(data),(index),(autofree)))
+#define getFromINSTD(ptr,index) (HPMi->getFromHPData(HPDT_INSTANCE,HPMi->pid,(ptr),(index)))
+#define removeFromINSTD(ptr,index) (HPMi->removeFromHPData(HPDT_INSTANCE,HPMi->pid,(ptr),(index)))
+
+/* HPMi->addCommand */
+#define addAtcommand(cname,funcname) \
+	if ( HPMi->addCommand != NULL ) { \
+		HPMi->addCommand(cname,atcommand_ ## funcname); \
+	} else { \
+		ShowWarning("HPM (%s):addAtcommand(\"%s\",%s) failed, addCommand sub is NULL!\n",pinfo.name,cname,# funcname);\
+	}
+/* HPMi->addScript */
+#define addScriptCommand(cname,scinfo,funcname) \
+	if ( HPMi->addScript != NULL ) { \
+		HPMi->addScript(cname,scinfo,buildin_ ## funcname); \
+	} else { \
+		ShowWarning("HPM (%s):addScriptCommand(\"%s\",\"%s\",%s) failed, addScript sub is NULL!\n",pinfo.name,cname,scinfo,# funcname);\
+	}
+/* HPMi->addCPCommand */
+#define addCPCommand(cname,funcname) \
+	if ( HPMi->addCPCommand != NULL ) { \
+		HPMi->addCPCommand(cname,console_parse_ ## funcname); \
+	} else { \
+		ShowWarning("HPM (%s):addCPCommand(\"%s\",%s) failed, addCPCommand sub is NULL!\n",pinfo.name,cname,# funcname);\
+	}
+/* HPMi->addPacket */
+#define addPacket(cmd,len,receive,point) HPMi->addPacket(cmd,len,receive,point,HPMi->pid)
+/* HPMi->addBattleConf */
+#define addBattleConf(bcname,funcname) HPMi->addConf(HPMi->pid,HPCT_BATTLE,bcname,funcname)
+
+/* HPMi->addPCGPermission */
+#define addGroupPermission(pcgname,maskptr) HPMi->addPCGPermission(HPMi->pid,pcgname,&maskptr)
+
 /* Hercules Plugin Mananger Include Interface */
 HPExport struct HPMi_interface {
+	/* */
+	unsigned int pid;
+	/* */
 	void (*event[HPET_MAX]) (void);
 	bool (*addCommand) (char *name, bool (*func)(const int fd, struct map_session_data* sd, const char* command, const char* message,struct AtCommandInfo *info));
 	bool (*addScript) (char *name, char *args, bool (*func)(struct script_state *st));
 	void (*addCPCommand) (char *name, CParseFunc func);
+	/* HPM Custom Data */
+	void (*addToHPData) (enum HPluginDataTypes type, unsigned int pluginID, void *ptr, void *data, unsigned int index, bool autofree);
+	void *(*getFromHPData) (enum HPluginDataTypes type, unsigned int pluginID, void *ptr, unsigned int index);
+	void (*removeFromHPData) (enum HPluginDataTypes type, unsigned int pluginID, void *ptr, unsigned int index);
+	/* packet */
+	bool (*addPacket) (unsigned short cmd, unsigned short length, void (*receive)(int fd), unsigned int point, unsigned int pluginID);
+	/* Hooking */
+	bool (*AddHook) (enum HPluginHookType type, const char *target, void *hook, unsigned int pID);
+	void (*HookStop) (const char *func, unsigned int pID);
+	bool (*HookStopped) (void);
+	/* program --arg/-a */
+	bool (*addArg) (unsigned int pluginID, char *name, bool has_param,void (*func) (char *param),void (*help) (void));
+	/* battle-config recv param */
+	bool (*addConf) (unsigned int pluginID, enum HPluginConfType type, char *name, void (*func) (const char *val));
+	/* pc group permission */
+	void (*addPCGPermission) (unsigned int pluginID, char *name, unsigned int *mask);
 } HPMi_s;
-#ifndef _HPM_H_
-	HPExport struct HPMi_interface *HPMi;
+#ifndef HERCULES_CORE
+HPExport struct HPMi_interface *HPMi;
 #endif
 
-#endif /* _HPMi_H_ */
+#endif /* COMMON_HPMI_H */