Merge pull request #1976 from mekolat/printf

expose script_sprintf to plugins

6 files changed, 36 insertions, 0 deletions

diff --git a/src/map/script.c b/src/map/script.c
index 26de803d7..d653800cc 100644
--- a/src/map/script.c
+++ b/src/map/script.c
@@ -25180,6 +25180,7 @@ void script_defaults(void)
 	script->search_str = script_search_str;
 	script->setd_sub = setd_sub;
 	script->attach_state = script_attach_state;
+	script->sprintf = script_sprintf;
 
 	script->queue = script_hqueue_get;
 	script->queue_add = script_hqueue_add;
diff --git a/src/map/script.h b/src/map/script.h
index 14d20838d..2dc3b2327 100644
--- a/src/map/script.h
+++ b/src/map/script.h
@@ -909,6 +909,7 @@ struct script_interface {
 	int (*buildin_mobuseskill_sub) (struct block_list *bl, va_list ap);
 	int (*cleanfloor_sub) (struct block_list *bl, va_list ap);
 	int (*run_func) (struct script_state *st);
+	bool (*sprintf) (struct script_state *st, int start, struct StringBuf *out);
 	const char *(*getfuncname) (struct script_state *st);
 	// for ENABLE_CASE_CHECK
 	unsigned int (*calc_hash_ci) (const char *p);
diff --git a/src/plugins/HPMHooking/HPMHooking.Defs.inc b/src/plugins/HPMHooking/HPMHooking.Defs.inc
index 301fccb92..822faa0cd 100644
--- a/src/plugins/HPMHooking/HPMHooking.Defs.inc
+++ b/src/plugins/HPMHooking/HPMHooking.Defs.inc
@@ -6434,6 +6434,8 @@ typedef int (*HPMHOOK_pre_script_cleanfloor_sub) (struct block_list **bl, va_lis
 typedef int (*HPMHOOK_post_script_cleanfloor_sub) (int retVal___, struct block_list *bl, va_list ap);
 typedef int (*HPMHOOK_pre_script_run_func) (struct script_state **st);
 typedef int (*HPMHOOK_post_script_run_func) (int retVal___, struct script_state *st);
+typedef bool (*HPMHOOK_pre_script_sprintf) (struct script_state **st, int *start, struct StringBuf **out);
+typedef bool (*HPMHOOK_post_script_sprintf) (bool retVal___, struct script_state *st, int start, struct StringBuf *out);
 typedef const char* (*HPMHOOK_pre_script_getfuncname) (struct script_state **st);
 typedef const char* (*HPMHOOK_post_script_getfuncname) (const char* retVal___, struct script_state *st);
 typedef unsigned int (*HPMHOOK_pre_script_calc_hash_ci) (const char **p);
diff --git a/src/plugins/HPMHooking/HPMHooking_map.HPMHooksCore.inc b/src/plugins/HPMHooking/HPMHooking_map.HPMHooksCore.inc
index 0e027043e..9d531e370 100644
--- a/src/plugins/HPMHooking/HPMHooking_map.HPMHooksCore.inc
+++ b/src/plugins/HPMHooking/HPMHooking_map.HPMHooksCore.inc
@@ -5054,6 +5054,8 @@ struct {
 	struct HPMHookPoint *HP_script_cleanfloor_sub_post;
 	struct HPMHookPoint *HP_script_run_func_pre;
 	struct HPMHookPoint *HP_script_run_func_post;
+	struct HPMHookPoint *HP_script_sprintf_pre;
+	struct HPMHookPoint *HP_script_sprintf_post;
 	struct HPMHookPoint *HP_script_getfuncname_pre;
 	struct HPMHookPoint *HP_script_getfuncname_post;
 	struct HPMHookPoint *HP_script_calc_hash_ci_pre;
@@ -11333,6 +11335,8 @@ struct {
 	int HP_script_cleanfloor_sub_post;
 	int HP_script_run_func_pre;
 	int HP_script_run_func_post;
+	int HP_script_sprintf_pre;
+	int HP_script_sprintf_post;
 	int HP_script_getfuncname_pre;
 	int HP_script_getfuncname_post;
 	int HP_script_calc_hash_ci_pre;
diff --git a/src/plugins/HPMHooking/HPMHooking_map.HookingPoints.inc b/src/plugins/HPMHooking/HPMHooking_map.HookingPoints.inc
index f668cfec6..5551668d2 100644
--- a/src/plugins/HPMHooking/HPMHooking_map.HookingPoints.inc
+++ b/src/plugins/HPMHooking/HPMHooking_map.HookingPoints.inc
@@ -2589,6 +2589,7 @@ struct HookingPointData HookingPoints[] = {
 	{ HP_POP(script->buildin_mobuseskill_sub, HP_script_buildin_mobuseskill_sub) },
 	{ HP_POP(script->cleanfloor_sub, HP_script_cleanfloor_sub) },
 	{ HP_POP(script->run_func, HP_script_run_func) },
+	{ HP_POP(script->sprintf, HP_script_sprintf) },
 	{ HP_POP(script->getfuncname, HP_script_getfuncname) },
 	{ HP_POP(script->calc_hash_ci, HP_script_calc_hash_ci) },
 	{ HP_POP(script->array_src, HP_script_array_src) },
diff --git a/src/plugins/HPMHooking/HPMHooking_map.Hooks.inc b/src/plugins/HPMHooking/HPMHooking_map.Hooks.inc
index e2ce065fb..f42f8fc1c 100644
--- a/src/plugins/HPMHooking/HPMHooking_map.Hooks.inc
+++ b/src/plugins/HPMHooking/HPMHooking_map.Hooks.inc
@@ -67480,6 +67480,33 @@ int HP_script_run_func(struct script_state *st) {
 	}
 	return retVal___;
 }
+bool HP_script_sprintf(struct script_state *st, int start, struct StringBuf *out) {
+	int hIndex = 0;
+	bool retVal___ = false;
+	if (HPMHooks.count.HP_script_sprintf_pre > 0) {
+		bool (*preHookFunc) (struct script_state **st, int *start, struct StringBuf **out);
+		*HPMforce_return = false;
+		for (hIndex = 0; hIndex < HPMHooks.count.HP_script_sprintf_pre; hIndex++) {
+			preHookFunc = HPMHooks.list.HP_script_sprintf_pre[hIndex].func;
+			retVal___ = preHookFunc(&st, &start, &out);
+		}
+		if (*HPMforce_return) {
+			*HPMforce_return = false;
+			return retVal___;
+		}
+	}
+	{
+		retVal___ = HPMHooks.source.script.sprintf(st, start, out);
+	}
+	if (HPMHooks.count.HP_script_sprintf_post > 0) {
+		bool (*postHookFunc) (bool retVal___, struct script_state *st, int start, struct StringBuf *out);
+		for (hIndex = 0; hIndex < HPMHooks.count.HP_script_sprintf_post; hIndex++) {
+			postHookFunc = HPMHooks.list.HP_script_sprintf_post[hIndex].func;
+			retVal___ = postHookFunc(retVal___, st, start, out);
+		}
+	}
+	return retVal___;
+}
 const char* HP_script_getfuncname(struct script_state *st) {
 	int hIndex = 0;
 	const char* retVal___ = NULL;