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

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

Conflicts:
	src/map/battle.c

15 files changed, 401 insertions, 0 deletions

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