Merge branch 'master' of github.com:HerculesWS/Hercules

Signed-off-by: shennetsind <ind@henn.et>

Conflicts:
	src/map/battle.c

18 files changed, 456 insertions, 11 deletions

diff --git a/src/plugins/HPMHooking.c b/src/plugins/HPMHooking.c
index 46792b268..3f3ecc4ec 100644
--- a/src/plugins/HPMHooking.c
+++ b/src/plugins/HPMHooking.c
@@ -11,6 +11,29 @@
 #include "../common/malloc.h"
 #include "../common/mmo.h"
 #include "../common/socket.h"
+
+#if defined (HPMHOOKING_LOGIN)
+#define HPM_SERVER_TYPE SERVER_TYPE_LOGIN
+#define HPM_CORE_INCLUDE "../plugins/HPMHooking/HPMHooking_login.HPMHooksCore.inc"
+#define HPM_SYMBOL_INCLUDE "../plugins/HPMHooking/HPMHooking_login.GetSymbol.inc"
+#define HPM_HOOKS_INCLUDE "../plugins/HPMHooking/HPMHooking_login.Hooks.inc"
+#define HPM_POINTS_INCLUDE "../plugins/HPMHooking/HPMHooking_login.HookingPoints.inc"
+#define HPM_SOURCES_INCLUDE "../plugins/HPMHooking/HPMHooking_login.sources.inc"
+#elif defined (HPMHOOKING_CHAR)
+#define HPM_SERVER_TYPE SERVER_TYPE_CHAR
+#define HPM_CORE_INCLUDE "../plugins/HPMHooking/HPMHooking_char.HPMHooksCore.inc"
+#define HPM_SYMBOL_INCLUDE "../plugins/HPMHooking/HPMHooking_char.GetSymbol.inc"
+#define HPM_HOOKS_INCLUDE "../plugins/HPMHooking/HPMHooking_char.Hooks.inc"
+#define HPM_POINTS_INCLUDE "../plugins/HPMHooking/HPMHooking_char.HookingPoints.inc"
+#define HPM_SOURCES_INCLUDE "../plugins/HPMHooking/HPMHooking_char.sources.inc"
+#include "../char/pincode.h"
+#elif defined (HPMHOOKING_MAP)
+#define HPM_SERVER_TYPE SERVER_TYPE_MAP
+#define HPM_CORE_INCLUDE "../plugins/HPMHooking/HPMHooking_map.HPMHooksCore.inc"
+#define HPM_SYMBOL_INCLUDE "../plugins/HPMHooking/HPMHooking_map.GetSymbol.inc"
+#define HPM_HOOKS_INCLUDE "../plugins/HPMHooking/HPMHooking_map.Hooks.inc"
+#define HPM_POINTS_INCLUDE "../plugins/HPMHooking/HPMHooking_map.HookingPoints.inc"
+#define HPM_SOURCES_INCLUDE "../plugins/HPMHooking/HPMHooking_map.sources.inc"
 #include "../map/atcommand.h"
 #include "../map/battle.h"
 #include "../map/battleground.h"
@@ -44,13 +67,22 @@
 #include "../map/storage.h"
 #include "../map/trade.h"
 #include "../map/unit.h"
+#else
+#define HPM_SERVER_TYPE SERVER_TYPE_UNKNOWN
+#define HPM_CORE_INCLUDE "../plugins/HPMHooking/HPMHooking.HPMHooksCore.inc"
+#define HPM_SYMBOL_INCLUDE "../plugins/HPMHooking/HPMHooking.GetSymbol.inc"
+#define HPM_HOOKS_INCLUDE "../plugins/HPMHooking/HPMHooking.Hooks.inc"
+#define HPM_POINTS_INCLUDE "../plugins/HPMHooking/HPMHooking.HookingPoints.inc"
+#define HPM_SOURCES_INCLUDE "../plugins/HPMHooking/HPMHooking.sources.inc"
+#error HPMHooking plugin needs to be compiled for a specific server type. Please make sure your Makefiles are up to date.
+#endif
 
 #include "../common/HPMDataCheck.h"
 
 HPExport struct hplugin_info pinfo = {
 	"HPMHooking",   // Plugin name
-	SERVER_TYPE_MAP,// Which server types this plugin works with?
-	"0.1",          // Plugin version
+	HPM_SERVER_TYPE,// Which server types this plugin works with?
+	"0.2",          // Plugin version
 	HPM_VERSION,    // HPM Version (don't change, macro is automatically updated)
 };
 
@@ -70,7 +102,7 @@ struct HPMHookPoint {
 };
 
 struct HPMHooksCore {
-	#include "../plugins/HPMHooking/HPMHooking.HPMHooksCore.inc"
+	#include HPM_CORE_INCLUDE
 	struct {
 		int total;
 	} data;
@@ -89,7 +121,7 @@ HPExport bool Hooked (bool *fr) {
 	HPMforce_return = fr;
 	DB = GET_SYMBOL("DB");
 	iMalloc = GET_SYMBOL("iMalloc");
-#include "../plugins/HPMHooking/HPMHooking.GetSymbol.inc"
+#include HPM_SYMBOL_INCLUDE
 	HPM_HP_load();
 	return true;
 }
@@ -127,7 +159,7 @@ HPExport bool HPM_Plugin_AddHook(enum HPluginHookType type, const char *target,
 	return false;
 }
 
-#include "../plugins/HPMHooking/HPMHooking.Hooks.inc"
+#include HPM_HOOKS_INCLUDE
 
 void HPM_HP_final(void) {
 	int i, len = HPMHooks.data.total * 2;
@@ -149,7 +181,7 @@ void HPM_HP_final(void) {
 }
 
 void HPM_HP_load(void) {
-	#include "../plugins/HPMHooking/HPMHooking.HookingPoints.inc"
+	#include HPM_POINTS_INCLUDE
 	int i, len = ARRAYLENGTH(HookingPoints), idx = 0;
 	
 	memset(&HPMHooks,0,sizeof(struct HPMHooksCore));
@@ -171,6 +203,6 @@ void HPM_HP_load(void) {
 		HPMHooks.data.total++;
 	}
 	
-	#include "../plugins/HPMHooking/HPMHooking.sources.inc"
+	#include HPM_SOURCES_INCLUDE
 }
 
diff --git a/src/plugins/HPMHooking/HPMHooking_char.GetSymbol.inc b/src/plugins/HPMHooking/HPMHooking_char.GetSymbol.inc
new file mode 100644
index 000000000..84800ca49
--- /dev/null
+++ b/src/plugins/HPMHooking/HPMHooking_char.GetSymbol.inc
@@ -0,0 +1,7 @@
+// Copyright (c) Hercules Dev Team, licensed under GNU GPL.
+// See the LICENSE file
+//
+// NOTE: This file was auto-generated and should never be manually edited,
+//       as it will get overwritten.
+
+if( !(pincode = GET_SYMBOL("pincode") ) ) return false;
diff --git a/src/plugins/HPMHooking/HPMHooking_char.HPMHooksCore.inc b/src/plugins/HPMHooking/HPMHooking_char.HPMHooksCore.inc
new file mode 100644
index 000000000..4a940739f
--- /dev/null
+++ b/src/plugins/HPMHooking/HPMHooking_char.HPMHooksCore.inc
@@ -0,0 +1,55 @@
+// Copyright (c) Hercules Dev Team, licensed under GNU GPL.
+// See the LICENSE file
+//
+// NOTE: This file was auto-generated and should never be manually edited,
+//       as it will get overwritten.
+
+struct {
+	struct HPMHookPoint *HP_pincode_handle_pre;
+	struct HPMHookPoint *HP_pincode_handle_post;
+	struct HPMHookPoint *HP_pincode_decrypt_pre;
+	struct HPMHookPoint *HP_pincode_decrypt_post;
+	struct HPMHookPoint *HP_pincode_error_pre;
+	struct HPMHookPoint *HP_pincode_error_post;
+	struct HPMHookPoint *HP_pincode_update_pre;
+	struct HPMHookPoint *HP_pincode_update_post;
+	struct HPMHookPoint *HP_pincode_sendstate_pre;
+	struct HPMHookPoint *HP_pincode_sendstate_post;
+	struct HPMHookPoint *HP_pincode_setnew_pre;
+	struct HPMHookPoint *HP_pincode_setnew_post;
+	struct HPMHookPoint *HP_pincode_change_pre;
+	struct HPMHookPoint *HP_pincode_change_post;
+	struct HPMHookPoint *HP_pincode_compare_pre;
+	struct HPMHookPoint *HP_pincode_compare_post;
+	struct HPMHookPoint *HP_pincode_check_pre;
+	struct HPMHookPoint *HP_pincode_check_post;
+	struct HPMHookPoint *HP_pincode_config_read_pre;
+	struct HPMHookPoint *HP_pincode_config_read_post;
+} list;
+
+struct {
+	int HP_pincode_handle_pre;
+	int HP_pincode_handle_post;
+	int HP_pincode_decrypt_pre;
+	int HP_pincode_decrypt_post;
+	int HP_pincode_error_pre;
+	int HP_pincode_error_post;
+	int HP_pincode_update_pre;
+	int HP_pincode_update_post;
+	int HP_pincode_sendstate_pre;
+	int HP_pincode_sendstate_post;
+	int HP_pincode_setnew_pre;
+	int HP_pincode_setnew_post;
+	int HP_pincode_change_pre;
+	int HP_pincode_change_post;
+	int HP_pincode_compare_pre;
+	int HP_pincode_compare_post;
+	int HP_pincode_check_pre;
+	int HP_pincode_check_post;
+	int HP_pincode_config_read_pre;
+	int HP_pincode_config_read_post;
+} count;
+
+struct {
+	struct pincode_interface pincode;
+} source;
diff --git a/src/plugins/HPMHooking/HPMHooking_char.HookingPoints.inc b/src/plugins/HPMHooking/HPMHooking_char.HookingPoints.inc
new file mode 100644
index 000000000..11c3b86a7
--- /dev/null
+++ b/src/plugins/HPMHooking/HPMHooking_char.HookingPoints.inc
@@ -0,0 +1,21 @@
+// Copyright (c) Hercules Dev Team, licensed under GNU GPL.
+// See the LICENSE file
+//
+// NOTE: This file was auto-generated and should never be manually edited,
+//       as it will get overwritten.
+
+struct HookingPointData HookingPoints[] = {
+/* pincode */
+	{ HP_POP(pincode->handle, HP_pincode_handle) },
+	{ HP_POP(pincode->decrypt, HP_pincode_decrypt) },
+	{ HP_POP(pincode->error, HP_pincode_error) },
+	{ HP_POP(pincode->update, HP_pincode_update) },
+	{ HP_POP(pincode->sendstate, HP_pincode_sendstate) },
+	{ HP_POP(pincode->setnew, HP_pincode_setnew) },
+	{ HP_POP(pincode->change, HP_pincode_change) },
+	{ HP_POP(pincode->compare, HP_pincode_compare) },
+	{ HP_POP(pincode->check, HP_pincode_check) },
+	{ HP_POP(pincode->config_read, HP_pincode_config_read) },
+};
+
+int HookingPointsLenMax = 20;
diff --git a/src/plugins/HPMHooking/HPMHooking_char.Hooks.inc b/src/plugins/HPMHooking/HPMHooking_char.Hooks.inc
new file mode 100644
index 000000000..d795ebb4a
--- /dev/null
+++ b/src/plugins/HPMHooking/HPMHooking_char.Hooks.inc
@@ -0,0 +1,269 @@
+// Copyright (c) Hercules Dev Team, licensed under GNU GPL.
+// See the LICENSE file
+//
+// NOTE: This file was auto-generated and should never be manually edited,
+//       as it will get overwritten.
+
+/* pincode */
+void HP_pincode_handle(int fd, struct char_session_data *sd) {
+	int hIndex = 0;
+	if( HPMHooks.count.HP_pincode_handle_pre ) {
+		void (*preHookFunc) (int *fd, struct char_session_data *sd);
+		*HPMforce_return = false;
+		for(hIndex = 0; hIndex < HPMHooks.count.HP_pincode_handle_pre; hIndex++ ) {
+			preHookFunc = HPMHooks.list.HP_pincode_handle_pre[hIndex].func;
+			preHookFunc(&fd, sd);
+		}
+		if( *HPMforce_return ) {
+			*HPMforce_return = false;
+			return;
+		}
+	}
+	{
+		HPMHooks.source.pincode.handle(fd, sd);
+	}
+	if( HPMHooks.count.HP_pincode_handle_post ) {
+		void (*postHookFunc) (int *fd, struct char_session_data *sd);
+		for(hIndex = 0; hIndex < HPMHooks.count.HP_pincode_handle_post; hIndex++ ) {
+			postHookFunc = HPMHooks.list.HP_pincode_handle_post[hIndex].func;
+			postHookFunc(&fd, sd);
+		}
+	}
+	return;
+}
+void HP_pincode_decrypt(unsigned int userSeed, char *pin) {
+	int hIndex = 0;
+	if( HPMHooks.count.HP_pincode_decrypt_pre ) {
+		void (*preHookFunc) (unsigned int *userSeed, char *pin);
+		*HPMforce_return = false;
+		for(hIndex = 0; hIndex < HPMHooks.count.HP_pincode_decrypt_pre; hIndex++ ) {
+			preHookFunc = HPMHooks.list.HP_pincode_decrypt_pre[hIndex].func;
+			preHookFunc(&userSeed, pin);
+		}
+		if( *HPMforce_return ) {
+			*HPMforce_return = false;
+			return;
+		}
+	}
+	{
+		HPMHooks.source.pincode.decrypt(userSeed, pin);
+	}
+	if( HPMHooks.count.HP_pincode_decrypt_post ) {
+		void (*postHookFunc) (unsigned int *userSeed, char *pin);
+		for(hIndex = 0; hIndex < HPMHooks.count.HP_pincode_decrypt_post; hIndex++ ) {
+			postHookFunc = HPMHooks.list.HP_pincode_decrypt_post[hIndex].func;
+			postHookFunc(&userSeed, pin);
+		}
+	}
+	return;
+}
+void HP_pincode_error(int account_id) {
+	int hIndex = 0;
+	if( HPMHooks.count.HP_pincode_error_pre ) {
+		void (*preHookFunc) (int *account_id);
+		*HPMforce_return = false;
+		for(hIndex = 0; hIndex < HPMHooks.count.HP_pincode_error_pre; hIndex++ ) {
+			preHookFunc = HPMHooks.list.HP_pincode_error_pre[hIndex].func;
+			preHookFunc(&account_id);
+		}
+		if( *HPMforce_return ) {
+			*HPMforce_return = false;
+			return;
+		}
+	}
+	{
+		HPMHooks.source.pincode.error(account_id);
+	}
+	if( HPMHooks.count.HP_pincode_error_post ) {
+		void (*postHookFunc) (int *account_id);
+		for(hIndex = 0; hIndex < HPMHooks.count.HP_pincode_error_post; hIndex++ ) {
+			postHookFunc = HPMHooks.list.HP_pincode_error_post[hIndex].func;
+			postHookFunc(&account_id);
+		}
+	}
+	return;
+}
+void HP_pincode_update(int account_id, char *pin) {
+	int hIndex = 0;
+	if( HPMHooks.count.HP_pincode_update_pre ) {
+		void (*preHookFunc) (int *account_id, char *pin);
+		*HPMforce_return = false;
+		for(hIndex = 0; hIndex < HPMHooks.count.HP_pincode_update_pre; hIndex++ ) {
+			preHookFunc = HPMHooks.list.HP_pincode_update_pre[hIndex].func;
+			preHookFunc(&account_id, pin);
+		}
+		if( *HPMforce_return ) {
+			*HPMforce_return = false;
+			return;
+		}
+	}
+	{
+		HPMHooks.source.pincode.update(account_id, pin);
+	}
+	if( HPMHooks.count.HP_pincode_update_post ) {
+		void (*postHookFunc) (int *account_id, char *pin);
+		for(hIndex = 0; hIndex < HPMHooks.count.HP_pincode_update_post; hIndex++ ) {
+			postHookFunc = HPMHooks.list.HP_pincode_update_post[hIndex].func;
+			postHookFunc(&account_id, pin);
+		}
+	}
+	return;
+}
+void HP_pincode_sendstate(int fd, struct char_session_data *sd, uint16 state) {
+	int hIndex = 0;
+	if( HPMHooks.count.HP_pincode_sendstate_pre ) {
+		void (*preHookFunc) (int *fd, struct char_session_data *sd, uint16 *state);
+		*HPMforce_return = false;
+		for(hIndex = 0; hIndex < HPMHooks.count.HP_pincode_sendstate_pre; hIndex++ ) {
+			preHookFunc = HPMHooks.list.HP_pincode_sendstate_pre[hIndex].func;
+			preHookFunc(&fd, sd, &state);
+		}
+		if( *HPMforce_return ) {
+			*HPMforce_return = false;
+			return;
+		}
+	}
+	{
+		HPMHooks.source.pincode.sendstate(fd, sd, state);
+	}
+	if( HPMHooks.count.HP_pincode_sendstate_post ) {
+		void (*postHookFunc) (int *fd, struct char_session_data *sd, uint16 *state);
+		for(hIndex = 0; hIndex < HPMHooks.count.HP_pincode_sendstate_post; hIndex++ ) {
+			postHookFunc = HPMHooks.list.HP_pincode_sendstate_post[hIndex].func;
+			postHookFunc(&fd, sd, &state);
+		}
+	}
+	return;
+}
+void HP_pincode_setnew(int fd, struct char_session_data *sd) {
+	int hIndex = 0;
+	if( HPMHooks.count.HP_pincode_setnew_pre ) {
+		void (*preHookFunc) (int *fd, struct char_session_data *sd);
+		*HPMforce_return = false;
+		for(hIndex = 0; hIndex < HPMHooks.count.HP_pincode_setnew_pre; hIndex++ ) {
+			preHookFunc = HPMHooks.list.HP_pincode_setnew_pre[hIndex].func;
+			preHookFunc(&fd, sd);
+		}
+		if( *HPMforce_return ) {
+			*HPMforce_return = false;
+			return;
+		}
+	}
+	{
+		HPMHooks.source.pincode.setnew(fd, sd);
+	}
+	if( HPMHooks.count.HP_pincode_setnew_post ) {
+		void (*postHookFunc) (int *fd, struct char_session_data *sd);
+		for(hIndex = 0; hIndex < HPMHooks.count.HP_pincode_setnew_post; hIndex++ ) {
+			postHookFunc = HPMHooks.list.HP_pincode_setnew_post[hIndex].func;
+			postHookFunc(&fd, sd);
+		}
+	}
+	return;
+}
+void HP_pincode_change(int fd, struct char_session_data *sd) {
+	int hIndex = 0;
+	if( HPMHooks.count.HP_pincode_change_pre ) {
+		void (*preHookFunc) (int *fd, struct char_session_data *sd);
+		*HPMforce_return = false;
+		for(hIndex = 0; hIndex < HPMHooks.count.HP_pincode_change_pre; hIndex++ ) {
+			preHookFunc = HPMHooks.list.HP_pincode_change_pre[hIndex].func;
+			preHookFunc(&fd, sd);
+		}
+		if( *HPMforce_return ) {
+			*HPMforce_return = false;
+			return;
+		}
+	}
+	{
+		HPMHooks.source.pincode.change(fd, sd);
+	}
+	if( HPMHooks.count.HP_pincode_change_post ) {
+		void (*postHookFunc) (int *fd, struct char_session_data *sd);
+		for(hIndex = 0; hIndex < HPMHooks.count.HP_pincode_change_post; hIndex++ ) {
+			postHookFunc = HPMHooks.list.HP_pincode_change_post[hIndex].func;
+			postHookFunc(&fd, sd);
+		}
+	}
+	return;
+}
+int HP_pincode_compare(int fd, struct char_session_data *sd, char *pin) {
+	int hIndex = 0;
+	int retVal___ = 0;
+	if( HPMHooks.count.HP_pincode_compare_pre ) {
+		int (*preHookFunc) (int *fd, struct char_session_data *sd, char *pin);
+		*HPMforce_return = false;
+		for(hIndex = 0; hIndex < HPMHooks.count.HP_pincode_compare_pre; hIndex++ ) {
+			preHookFunc = HPMHooks.list.HP_pincode_compare_pre[hIndex].func;
+			retVal___ = preHookFunc(&fd, sd, pin);
+		}
+		if( *HPMforce_return ) {
+			*HPMforce_return = false;
+			return retVal___;
+		}
+	}
+	{
+		retVal___ = HPMHooks.source.pincode.compare(fd, sd, pin);
+	}
+	if( HPMHooks.count.HP_pincode_compare_post ) {
+		int (*postHookFunc) (int retVal___, int *fd, struct char_session_data *sd, char *pin);
+		for(hIndex = 0; hIndex < HPMHooks.count.HP_pincode_compare_post; hIndex++ ) {
+			postHookFunc = HPMHooks.list.HP_pincode_compare_post[hIndex].func;
+			retVal___ = postHookFunc(retVal___, &fd, sd, pin);
+		}
+	}
+	return retVal___;
+}
+void HP_pincode_check(int fd, struct char_session_data *sd) {
+	int hIndex = 0;
+	if( HPMHooks.count.HP_pincode_check_pre ) {
+		void (*preHookFunc) (int *fd, struct char_session_data *sd);
+		*HPMforce_return = false;
+		for(hIndex = 0; hIndex < HPMHooks.count.HP_pincode_check_pre; hIndex++ ) {
+			preHookFunc = HPMHooks.list.HP_pincode_check_pre[hIndex].func;
+			preHookFunc(&fd, sd);
+		}
+		if( *HPMforce_return ) {
+			*HPMforce_return = false;
+			return;
+		}
+	}
+	{
+		HPMHooks.source.pincode.check(fd, sd);
+	}
+	if( HPMHooks.count.HP_pincode_check_post ) {
+		void (*postHookFunc) (int *fd, struct char_session_data *sd);
+		for(hIndex = 0; hIndex < HPMHooks.count.HP_pincode_check_post; hIndex++ ) {
+			postHookFunc = HPMHooks.list.HP_pincode_check_post[hIndex].func;
+			postHookFunc(&fd, sd);
+		}
+	}
+	return;
+}
+bool HP_pincode_config_read(char *w1, char *w2) {
+	int hIndex = 0;
+	bool retVal___ = false;
+	if( HPMHooks.count.HP_pincode_config_read_pre ) {
+		bool (*preHookFunc) (char *w1, char *w2);
+		*HPMforce_return = false;
+		for(hIndex = 0; hIndex < HPMHooks.count.HP_pincode_config_read_pre; hIndex++ ) {
+			preHookFunc = HPMHooks.list.HP_pincode_config_read_pre[hIndex].func;
+			retVal___ = preHookFunc(w1, w2);
+		}
+		if( *HPMforce_return ) {
+			*HPMforce_return = false;
+			return retVal___;
+		}
+	}
+	{
+		retVal___ = HPMHooks.source.pincode.config_read(w1, w2);
+	}
+	if( HPMHooks.count.HP_pincode_config_read_post ) {
+		bool (*postHookFunc) (bool retVal___, char *w1, char *w2);
+		for(hIndex = 0; hIndex < HPMHooks.count.HP_pincode_config_read_post; hIndex++ ) {
+			postHookFunc = HPMHooks.list.HP_pincode_config_read_post[hIndex].func;
+			retVal___ = postHookFunc(retVal___, w1, w2);
+		}
+	}
+	return retVal___;
+}
diff --git a/src/plugins/HPMHooking/HPMHooking_char.sources.inc b/src/plugins/HPMHooking/HPMHooking_char.sources.inc
new file mode 100644
index 000000000..fd5d2d2bf
--- /dev/null
+++ b/src/plugins/HPMHooking/HPMHooking_char.sources.inc
@@ -0,0 +1,7 @@
+// Copyright (c) Hercules Dev Team, licensed under GNU GPL.
+// See the LICENSE file
+//
+// NOTE: This file was auto-generated and should never be manually edited,
+//       as it will get overwritten.
+
+memcpy(&HPMHooks.source.pincode, pincode, sizeof(struct pincode_interface));
diff --git a/src/plugins/HPMHooking/HPMHooking_login.GetSymbol.inc b/src/plugins/HPMHooking/HPMHooking_login.GetSymbol.inc
new file mode 100644
index 000000000..6dcfae29d
--- /dev/null
+++ b/src/plugins/HPMHooking/HPMHooking_login.GetSymbol.inc
@@ -0,0 +1,6 @@
+// Copyright (c) Hercules Dev Team, licensed under GNU GPL.
+// See the LICENSE file
+//
+// NOTE: This file was auto-generated and should never be manually edited,
+//       as it will get overwritten.
+
diff --git a/src/plugins/HPMHooking/HPMHooking_login.HPMHooksCore.inc b/src/plugins/HPMHooking/HPMHooking_login.HPMHooksCore.inc
new file mode 100644
index 000000000..4c380b367
--- /dev/null
+++ b/src/plugins/HPMHooking/HPMHooking_login.HPMHooksCore.inc
@@ -0,0 +1,14 @@
+// Copyright (c) Hercules Dev Team, licensed under GNU GPL.
+// See the LICENSE file
+//
+// NOTE: This file was auto-generated and should never be manually edited,
+//       as it will get overwritten.
+
+struct {
+} list;
+
+struct {
+} count;
+
+struct {
+} source;
diff --git a/src/plugins/HPMHooking/HPMHooking_login.HookingPoints.inc b/src/plugins/HPMHooking/HPMHooking_login.HookingPoints.inc
new file mode 100644
index 000000000..6752a4324
--- /dev/null
+++ b/src/plugins/HPMHooking/HPMHooking_login.HookingPoints.inc
@@ -0,0 +1,10 @@
+// Copyright (c) Hercules Dev Team, licensed under GNU GPL.
+// See the LICENSE file
+//
+// NOTE: This file was auto-generated and should never be manually edited,
+//       as it will get overwritten.
+
+struct HookingPointData HookingPoints[] = {
+};
+
+int HookingPointsLenMax = 0;
diff --git a/src/plugins/HPMHooking/HPMHooking_login.Hooks.inc b/src/plugins/HPMHooking/HPMHooking_login.Hooks.inc
new file mode 100644
index 000000000..6dcfae29d
--- /dev/null
+++ b/src/plugins/HPMHooking/HPMHooking_login.Hooks.inc
@@ -0,0 +1,6 @@
+// Copyright (c) Hercules Dev Team, licensed under GNU GPL.
+// See the LICENSE file
+//
+// NOTE: This file was auto-generated and should never be manually edited,
+//       as it will get overwritten.
+
diff --git a/src/plugins/HPMHooking/HPMHooking_login.sources.inc b/src/plugins/HPMHooking/HPMHooking_login.sources.inc
new file mode 100644
index 000000000..6dcfae29d
--- /dev/null
+++ b/src/plugins/HPMHooking/HPMHooking_login.sources.inc
@@ -0,0 +1,6 @@
+// Copyright (c) Hercules Dev Team, licensed under GNU GPL.
+// See the LICENSE file
+//
+// NOTE: This file was auto-generated and should never be manually edited,
+//       as it will get overwritten.
+
diff --git a/src/plugins/HPMHooking/HPMHooking.GetSymbol.inc b/src/plugins/HPMHooking/HPMHooking_map.GetSymbol.inc
index 8482b9f80..8482b9f80 100644
--- a/src/plugins/HPMHooking/HPMHooking.GetSymbol.inc
+++ b/src/plugins/HPMHooking/HPMHooking_map.GetSymbol.inc
diff --git a/src/plugins/HPMHooking/HPMHooking.HPMHooksCore.inc b/src/plugins/HPMHooking/HPMHooking_map.HPMHooksCore.inc
index 6054e9d9a..6054e9d9a 100644
--- a/src/plugins/HPMHooking/HPMHooking.HPMHooksCore.inc
+++ b/src/plugins/HPMHooking/HPMHooking_map.HPMHooksCore.inc
diff --git a/src/plugins/HPMHooking/HPMHooking.HookingPoints.inc b/src/plugins/HPMHooking/HPMHooking_map.HookingPoints.inc
index e2f946f7e..e2f946f7e 100644
--- a/src/plugins/HPMHooking/HPMHooking.HookingPoints.inc
+++ b/src/plugins/HPMHooking/HPMHooking_map.HookingPoints.inc
diff --git a/src/plugins/HPMHooking/HPMHooking.Hooks.inc b/src/plugins/HPMHooking/HPMHooking_map.Hooks.inc
index f47cf27f0..f47cf27f0 100644
--- a/src/plugins/HPMHooking/HPMHooking.Hooks.inc
+++ b/src/plugins/HPMHooking/HPMHooking_map.Hooks.inc
diff --git a/src/plugins/HPMHooking/HPMHooking.sources.inc b/src/plugins/HPMHooking/HPMHooking_map.sources.inc
index 53bb6bcad..53bb6bcad 100644
--- a/src/plugins/HPMHooking/HPMHooking.sources.inc
+++ b/src/plugins/HPMHooking/HPMHooking_map.sources.inc
diff --git a/src/plugins/Makefile.in b/src/plugins/Makefile.in
index 39f445319..7f94e6b67 100644
--- a/src/plugins/Makefile.in
+++ b/src/plugins/Makefile.in
@@ -24,10 +24,11 @@ MYPLUGINS =
 #########  DO NOT EDIT ANYTHING BELOW THIS LINE!!!  ##################
 
 # All plugins in the src/plugins directory
-ALLPLUGINS = $(basename $(wildcard *.c))
+HPMHOOKING = $(addprefix HPMHooking_, login char map)
+ALLPLUGINS = $(filter-out HPMHooking, $(basename $(wildcard *.c))) $(HPMHOOKING)
 
 # Plugins that will be built through 'make plugins' or 'make all'
-PLUGINS = sample db2sql HPMHooking $(MYPLUGINS)
+PLUGINS = sample db2sql HPMHooking_map $(MYPLUGINS)
 
 COMMON_D = ../common
 COMMON_H = $(wildcard $(COMMON_D)/*.h)
@@ -46,11 +47,14 @@ CC = @CC@
 export CC
 
 #####################################################################
-.PHONY: all $(ALLPLUGINS) clean buildclean help
+.PHONY: all $(ALLPLUGINS) HPMHooking clean buildclean help
 
 all: $(PLUGINS) Makefile
 
 $(ALLPLUGINS): %: ../../plugins/%@DLLEXT@
+	@echo "	PLUGIN	$@"
+
+HPMHooking: $(HPMHOOKING)
 
 buildclean:
 	@echo "	CLEAN	plugins (build temp files)"
@@ -81,3 +85,11 @@ Makefile: Makefile.in
 ../../plugins/%@DLLEXT@: %.c $(ALL_H) $$(shell ls %/* 2>/dev/null)
 	@echo "	CC	$<"
 	@$(CC) @PLUGINSTATIC@ @DEFS@ @CFLAGS@ @CPPFLAGS@ @LDFLAGS@ @SOFLAGS@ -o $@ $<
+
+../../plugins/HPMHooking_login@DLLEXT@: HPMHOOKINGTYPE = LOGIN
+../../plugins/HPMHooking_char@DLLEXT@: HPMHOOKINGTYPE = CHAR
+../../plugins/HPMHooking_map@DLLEXT@: HPMHOOKINGTYPE = MAP
+
+../../plugins/HPMHooking_%@DLLEXT@: HPMHooking.c $(ALL_H) $$(shell ls HPMHooking/*_%* HPMHooking/*_common* 2>/dev/null)
+	@echo "	CC	$< ($(HPMHOOKINGTYPE))"
+	@$(CC) -DHPMHOOKING_$(HPMHOOKINGTYPE) @PLUGINSTATIC@ @DEFS@ @CFLAGS@ @CPPFLAGS@ @LDFLAGS@ @SOFLAGS@ -o $@ $<
diff --git a/src/plugins/sample.c b/src/plugins/sample.c
index 84df88e06..88ef84d48 100644
--- a/src/plugins/sample.c
+++ b/src/plugins/sample.c
@@ -19,7 +19,7 @@
 
 HPExport struct hplugin_info pinfo = {
 	"Sample",		// Plugin name
-	SERVER_TYPE_MAP,// Which server types this plugin works with?
+	SERVER_TYPE_LOGIN|SERVER_TYPE_MAP,// Which server types this plugin works with?
 	"0.1",			// Plugin version
 	HPM_VERSION,	// HPM Version (don't change, macro is automatically updated)
 };