summaryrefslogtreecommitdiff
path: root/src/plugins
diff options
context:
space:
mode:
Diffstat (limited to 'src/plugins')
-rw-r--r--src/plugins/HPMHooking/HPMHooking_login.HPMHooksCore.inc8
-rw-r--r--src/plugins/HPMHooking/HPMHooking_login.HookingPoints.inc2
-rw-r--r--src/plugins/HPMHooking/HPMHooking_login.Hooks.inc53
-rw-r--r--src/plugins/HPMHooking/HPMHooking_map.HPMHooksCore.inc16
-rw-r--r--src/plugins/HPMHooking/HPMHooking_map.HookingPoints.inc4
-rw-r--r--src/plugins/HPMHooking/HPMHooking_map.Hooks.inc129
-rw-r--r--src/plugins/dbghelpplug.c6
7 files changed, 203 insertions, 15 deletions
diff --git a/src/plugins/HPMHooking/HPMHooking_login.HPMHooksCore.inc b/src/plugins/HPMHooking/HPMHooking_login.HPMHooksCore.inc
index 3a8bb2a5f..ce78fdd7e 100644
--- a/src/plugins/HPMHooking/HPMHooking_login.HPMHooksCore.inc
+++ b/src/plugins/HPMHooking/HPMHooking_login.HPMHooksCore.inc
@@ -314,6 +314,10 @@ struct {
struct HPMHookPoint *HP_login_parse_request_connection_post;
struct HPMHookPoint *HP_login_parse_login_pre;
struct HPMHookPoint *HP_login_parse_login_post;
+ struct HPMHookPoint *HP_login_config_set_defaults_pre;
+ struct HPMHookPoint *HP_login_config_set_defaults_post;
+ struct HPMHookPoint *HP_login_config_read_pre;
+ struct HPMHookPoint *HP_login_config_read_post;
struct HPMHookPoint *HP_iMalloc_init_pre;
struct HPMHookPoint *HP_iMalloc_init_post;
struct HPMHookPoint *HP_iMalloc_final_pre;
@@ -887,6 +891,10 @@ struct {
int HP_login_parse_request_connection_post;
int HP_login_parse_login_pre;
int HP_login_parse_login_post;
+ int HP_login_config_set_defaults_pre;
+ int HP_login_config_set_defaults_post;
+ int HP_login_config_read_pre;
+ int HP_login_config_read_post;
int HP_iMalloc_init_pre;
int HP_iMalloc_init_post;
int HP_iMalloc_final_pre;
diff --git a/src/plugins/HPMHooking/HPMHooking_login.HookingPoints.inc b/src/plugins/HPMHooking/HPMHooking_login.HookingPoints.inc
index 959bb076f..5be52d51e 100644
--- a/src/plugins/HPMHooking/HPMHooking_login.HookingPoints.inc
+++ b/src/plugins/HPMHooking/HPMHooking_login.HookingPoints.inc
@@ -175,6 +175,8 @@ struct HookingPointData HookingPoints[] = {
{ HP_POP(login->char_server_connection_status, HP_login_char_server_connection_status) },
{ HP_POP(login->parse_request_connection, HP_login_parse_request_connection) },
{ HP_POP(login->parse_login, HP_login_parse_login) },
+ { HP_POP(login->config_set_defaults, HP_login_config_set_defaults) },
+ { HP_POP(login->config_read, HP_login_config_read) },
/* iMalloc */
{ HP_POP(iMalloc->init, HP_iMalloc_init) },
{ HP_POP(iMalloc->final, HP_iMalloc_final) },
diff --git a/src/plugins/HPMHooking/HPMHooking_login.Hooks.inc b/src/plugins/HPMHooking/HPMHooking_login.Hooks.inc
index 2e2d9e619..670083e94 100644
--- a/src/plugins/HPMHooking/HPMHooking_login.Hooks.inc
+++ b/src/plugins/HPMHooking/HPMHooking_login.Hooks.inc
@@ -3914,6 +3914,59 @@ int HP_login_parse_login(int fd) {
}
return retVal___;
}
+void HP_login_config_set_defaults(void) {
+ int hIndex = 0;
+ if( HPMHooks.count.HP_login_config_set_defaults_pre ) {
+ void (*preHookFunc) (void);
+ *HPMforce_return = false;
+ for(hIndex = 0; hIndex < HPMHooks.count.HP_login_config_set_defaults_pre; hIndex++ ) {
+ preHookFunc = HPMHooks.list.HP_login_config_set_defaults_pre[hIndex].func;
+ preHookFunc();
+ }
+ if( *HPMforce_return ) {
+ *HPMforce_return = false;
+ return;
+ }
+ }
+ {
+ HPMHooks.source.login.config_set_defaults();
+ }
+ if( HPMHooks.count.HP_login_config_set_defaults_post ) {
+ void (*postHookFunc) (void);
+ for(hIndex = 0; hIndex < HPMHooks.count.HP_login_config_set_defaults_post; hIndex++ ) {
+ postHookFunc = HPMHooks.list.HP_login_config_set_defaults_post[hIndex].func;
+ postHookFunc();
+ }
+ }
+ return;
+}
+int HP_login_config_read(const char *cfgName) {
+ int hIndex = 0;
+ int retVal___ = 0;
+ if( HPMHooks.count.HP_login_config_read_pre ) {
+ int (*preHookFunc) (const char *cfgName);
+ *HPMforce_return = false;
+ for(hIndex = 0; hIndex < HPMHooks.count.HP_login_config_read_pre; hIndex++ ) {
+ preHookFunc = HPMHooks.list.HP_login_config_read_pre[hIndex].func;
+ retVal___ = preHookFunc(cfgName);
+ }
+ if( *HPMforce_return ) {
+ *HPMforce_return = false;
+ return retVal___;
+ }
+ }
+ {
+ retVal___ = HPMHooks.source.login.config_read(cfgName);
+ }
+ if( HPMHooks.count.HP_login_config_read_post ) {
+ int (*postHookFunc) (int retVal___, const char *cfgName);
+ for(hIndex = 0; hIndex < HPMHooks.count.HP_login_config_read_post; hIndex++ ) {
+ postHookFunc = HPMHooks.list.HP_login_config_read_post[hIndex].func;
+ retVal___ = postHookFunc(retVal___, cfgName);
+ }
+ }
+ return retVal___;
+}
/* iMalloc */
void HP_iMalloc_init(void) {
int hIndex = 0;
diff --git a/src/plugins/HPMHooking/HPMHooking_map.HPMHooksCore.inc b/src/plugins/HPMHooking/HPMHooking_map.HPMHooksCore.inc
index e5ec573a9..d909e9892 100644
--- a/src/plugins/HPMHooking/HPMHooking_map.HPMHooksCore.inc
+++ b/src/plugins/HPMHooking/HPMHooking_map.HPMHooksCore.inc
@@ -1848,6 +1848,12 @@ struct {
struct HPMHookPoint *HP_clif_pHotkeyRowShift_post;
struct HPMHookPoint *HP_clif_dressroom_open_pre;
struct HPMHookPoint *HP_clif_dressroom_open_post;
+ struct HPMHookPoint *HP_clif_pOneClick_ItemIdentify_pre;
+ struct HPMHookPoint *HP_clif_pOneClick_ItemIdentify_post;
+ struct HPMHookPoint *HP_clif_selectcart_pre;
+ struct HPMHookPoint *HP_clif_selectcart_post;
+ struct HPMHookPoint *HP_clif_pSelectCart_pre;
+ struct HPMHookPoint *HP_clif_pSelectCart_post;
struct HPMHookPoint *HP_cmdline_init_pre;
struct HPMHookPoint *HP_cmdline_init_post;
struct HPMHookPoint *HP_cmdline_final_pre;
@@ -4318,6 +4324,8 @@ struct {
struct HPMHookPoint *HP_pc_check_job_name_post;
struct HPMHookPoint *HP_pc_update_idle_time_pre;
struct HPMHookPoint *HP_pc_update_idle_time_post;
+ struct HPMHookPoint *HP_pc_have_magnifier_pre;
+ struct HPMHookPoint *HP_pc_have_magnifier_post;
struct HPMHookPoint *HP_libpcre_compile_pre;
struct HPMHookPoint *HP_libpcre_compile_post;
struct HPMHookPoint *HP_libpcre_study_pre;
@@ -7685,6 +7693,12 @@ struct {
int HP_clif_pHotkeyRowShift_post;
int HP_clif_dressroom_open_pre;
int HP_clif_dressroom_open_post;
+ int HP_clif_pOneClick_ItemIdentify_pre;
+ int HP_clif_pOneClick_ItemIdentify_post;
+ int HP_clif_selectcart_pre;
+ int HP_clif_selectcart_post;
+ int HP_clif_pSelectCart_pre;
+ int HP_clif_pSelectCart_post;
int HP_cmdline_init_pre;
int HP_cmdline_init_post;
int HP_cmdline_final_pre;
@@ -10155,6 +10169,8 @@ struct {
int HP_pc_check_job_name_post;
int HP_pc_update_idle_time_pre;
int HP_pc_update_idle_time_post;
+ int HP_pc_have_magnifier_pre;
+ int HP_pc_have_magnifier_post;
int HP_libpcre_compile_pre;
int HP_libpcre_compile_post;
int HP_libpcre_study_pre;
diff --git a/src/plugins/HPMHooking/HPMHooking_map.HookingPoints.inc b/src/plugins/HPMHooking/HPMHooking_map.HookingPoints.inc
index 67fb2ce19..db30c8c02 100644
--- a/src/plugins/HPMHooking/HPMHooking_map.HookingPoints.inc
+++ b/src/plugins/HPMHooking/HPMHooking_map.HookingPoints.inc
@@ -944,6 +944,9 @@ struct HookingPointData HookingPoints[] = {
{ HP_POP(clif->add_random_options, HP_clif_add_random_options) },
{ HP_POP(clif->pHotkeyRowShift, HP_clif_pHotkeyRowShift) },
{ HP_POP(clif->dressroom_open, HP_clif_dressroom_open) },
+ { HP_POP(clif->pOneClick_ItemIdentify, HP_clif_pOneClick_ItemIdentify) },
+ { HP_POP(clif->selectcart, HP_clif_selectcart) },
+ { HP_POP(clif->pSelectCart, HP_clif_pSelectCart) },
/* cmdline */
{ HP_POP(cmdline->init, HP_cmdline_init) },
{ HP_POP(cmdline->final, HP_cmdline_final) },
@@ -2209,6 +2212,7 @@ struct HookingPointData HookingPoints[] = {
{ HP_POP(pc->autotrade_final, HP_pc_autotrade_final) },
{ HP_POP(pc->check_job_name, HP_pc_check_job_name) },
{ HP_POP(pc->update_idle_time, HP_pc_update_idle_time) },
+ { HP_POP(pc->have_magnifier, HP_pc_have_magnifier) },
/* libpcre */
{ HP_POP(libpcre->compile, HP_libpcre_compile) },
{ HP_POP(libpcre->study, HP_libpcre_study) },
diff --git a/src/plugins/HPMHooking/HPMHooking_map.Hooks.inc b/src/plugins/HPMHooking/HPMHooking_map.Hooks.inc
index d7e798637..11bf66481 100644
--- a/src/plugins/HPMHooking/HPMHooking_map.Hooks.inc
+++ b/src/plugins/HPMHooking/HPMHooking_map.Hooks.inc
@@ -24067,6 +24067,84 @@ void HP_clif_dressroom_open(struct map_session_data *sd, int view) {
}
return;
}
+void HP_clif_pOneClick_ItemIdentify(int fd, struct map_session_data *sd) {
+ int hIndex = 0;
+ if( HPMHooks.count.HP_clif_pOneClick_ItemIdentify_pre ) {
+ void (*preHookFunc) (int *fd, struct map_session_data *sd);
+ *HPMforce_return = false;
+ for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_pOneClick_ItemIdentify_pre; hIndex++ ) {
+ preHookFunc = HPMHooks.list.HP_clif_pOneClick_ItemIdentify_pre[hIndex].func;
+ preHookFunc(&fd, sd);
+ }
+ if( *HPMforce_return ) {
+ *HPMforce_return = false;
+ return;
+ }
+ }
+ {
+ HPMHooks.source.clif.pOneClick_ItemIdentify(fd, sd);
+ }
+ if( HPMHooks.count.HP_clif_pOneClick_ItemIdentify_post ) {
+ void (*postHookFunc) (int *fd, struct map_session_data *sd);
+ for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_pOneClick_ItemIdentify_post; hIndex++ ) {
+ postHookFunc = HPMHooks.list.HP_clif_pOneClick_ItemIdentify_post[hIndex].func;
+ postHookFunc(&fd, sd);
+ }
+ }
+ return;
+}
+void HP_clif_selectcart(struct map_session_data *sd) {
+ int hIndex = 0;
+ if( HPMHooks.count.HP_clif_selectcart_pre ) {
+ void (*preHookFunc) (struct map_session_data *sd);
+ *HPMforce_return = false;
+ for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_selectcart_pre; hIndex++ ) {
+ preHookFunc = HPMHooks.list.HP_clif_selectcart_pre[hIndex].func;
+ preHookFunc(sd);
+ }
+ if( *HPMforce_return ) {
+ *HPMforce_return = false;
+ return;
+ }
+ }
+ {
+ HPMHooks.source.clif.selectcart(sd);
+ }
+ if( HPMHooks.count.HP_clif_selectcart_post ) {
+ void (*postHookFunc) (struct map_session_data *sd);
+ for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_selectcart_post; hIndex++ ) {
+ postHookFunc = HPMHooks.list.HP_clif_selectcart_post[hIndex].func;
+ postHookFunc(sd);
+ }
+ }
+ return;
+}
+void HP_clif_pSelectCart(int fd, struct map_session_data *sd) {
+ int hIndex = 0;
+ if( HPMHooks.count.HP_clif_pSelectCart_pre ) {
+ void (*preHookFunc) (int *fd, struct map_session_data *sd);
+ *HPMforce_return = false;
+ for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_pSelectCart_pre; hIndex++ ) {
+ preHookFunc = HPMHooks.list.HP_clif_pSelectCart_pre[hIndex].func;
+ preHookFunc(&fd, sd);
+ }
+ if( *HPMforce_return ) {
+ *HPMforce_return = false;
+ return;
+ }
+ }
+ {
+ HPMHooks.source.clif.pSelectCart(fd, sd);
+ }
+ if( HPMHooks.count.HP_clif_pSelectCart_post ) {
+ void (*postHookFunc) (int *fd, struct map_session_data *sd);
+ for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_pSelectCart_post; hIndex++ ) {
+ postHookFunc = HPMHooks.list.HP_clif_pSelectCart_post[hIndex].func;
+ postHookFunc(&fd, sd);
+ }
+ }
+ return;
+}
/* cmdline */
void HP_cmdline_init(void) {
int hIndex = 0;
@@ -57571,6 +57649,33 @@ void HP_pc_update_idle_time(struct map_session_data *sd, enum e_battle_config_id
}
return;
}
+int HP_pc_have_magnifier(struct map_session_data *sd) {
+ int hIndex = 0;
+ int retVal___ = 0;
+ if( HPMHooks.count.HP_pc_have_magnifier_pre ) {
+ int (*preHookFunc) (struct map_session_data *sd);
+ *HPMforce_return = false;
+ for(hIndex = 0; hIndex < HPMHooks.count.HP_pc_have_magnifier_pre; hIndex++ ) {
+ preHookFunc = HPMHooks.list.HP_pc_have_magnifier_pre[hIndex].func;
+ retVal___ = preHookFunc(sd);
+ }
+ if( *HPMforce_return ) {
+ *HPMforce_return = false;
+ return retVal___;
+ }
+ }
+ {
+ retVal___ = HPMHooks.source.pc.have_magnifier(sd);
+ }
+ if( HPMHooks.count.HP_pc_have_magnifier_post ) {
+ int (*postHookFunc) (int retVal___, struct map_session_data *sd);
+ for(hIndex = 0; hIndex < HPMHooks.count.HP_pc_have_magnifier_post; hIndex++ ) {
+ postHookFunc = HPMHooks.list.HP_pc_have_magnifier_post[hIndex].func;
+ retVal___ = postHookFunc(retVal___, sd);
+ }
+ }
+ return retVal___;
+}
/* libpcre */
pcre* HP_libpcre_compile(const char *pattern, int options, const char **errptr, int *erroffset, const unsigned char *tableptr) {
int hIndex = 0;
@@ -60089,14 +60194,14 @@ void HP_script_pop_stack(struct script_state *st, int start, int end) {
}
return;
}
-void HP_script_set_constant(const char *name, int value, bool isparameter) {
+void HP_script_set_constant(const char *name, int value, bool is_parameter, bool is_deprecated) {
int hIndex = 0;
if( HPMHooks.count.HP_script_set_constant_pre ) {
- void (*preHookFunc) (const char *name, int *value, bool *isparameter);
+ void (*preHookFunc) (const char *name, int *value, bool *is_parameter, bool *is_deprecated);
*HPMforce_return = false;
for(hIndex = 0; hIndex < HPMHooks.count.HP_script_set_constant_pre; hIndex++ ) {
preHookFunc = HPMHooks.list.HP_script_set_constant_pre[hIndex].func;
- preHookFunc(name, &value, &isparameter);
+ preHookFunc(name, &value, &is_parameter, &is_deprecated);
}
if( *HPMforce_return ) {
*HPMforce_return = false;
@@ -60104,25 +60209,25 @@ void HP_script_set_constant(const char *name, int value, bool isparameter) {
}
}
{
- HPMHooks.source.script.set_constant(name, value, isparameter);
+ HPMHooks.source.script.set_constant(name, value, is_parameter, is_deprecated);
}
if( HPMHooks.count.HP_script_set_constant_post ) {
- void (*postHookFunc) (const char *name, int *value, bool *isparameter);
+ void (*postHookFunc) (const char *name, int *value, bool *is_parameter, bool *is_deprecated);
for(hIndex = 0; hIndex < HPMHooks.count.HP_script_set_constant_post; hIndex++ ) {
postHookFunc = HPMHooks.list.HP_script_set_constant_post[hIndex].func;
- postHookFunc(name, &value, &isparameter);
+ postHookFunc(name, &value, &is_parameter, &is_deprecated);
}
}
return;
}
-void HP_script_set_constant2(const char *name, int value, bool isparameter) {
+void HP_script_set_constant2(const char *name, int value, bool is_parameter, bool is_deprecated) {
int hIndex = 0;
if( HPMHooks.count.HP_script_set_constant2_pre ) {
- void (*preHookFunc) (const char *name, int *value, bool *isparameter);
+ void (*preHookFunc) (const char *name, int *value, bool *is_parameter, bool *is_deprecated);
*HPMforce_return = false;
for(hIndex = 0; hIndex < HPMHooks.count.HP_script_set_constant2_pre; hIndex++ ) {
preHookFunc = HPMHooks.list.HP_script_set_constant2_pre[hIndex].func;
- preHookFunc(name, &value, &isparameter);
+ preHookFunc(name, &value, &is_parameter, &is_deprecated);
}
if( *HPMforce_return ) {
*HPMforce_return = false;
@@ -60130,13 +60235,13 @@ void HP_script_set_constant2(const char *name, int value, bool isparameter) {
}
}
{
- HPMHooks.source.script.set_constant2(name, value, isparameter);
+ HPMHooks.source.script.set_constant2(name, value, is_parameter, is_deprecated);
}
if( HPMHooks.count.HP_script_set_constant2_post ) {
- void (*postHookFunc) (const char *name, int *value, bool *isparameter);
+ void (*postHookFunc) (const char *name, int *value, bool *is_parameter, bool *is_deprecated);
for(hIndex = 0; hIndex < HPMHooks.count.HP_script_set_constant2_post; hIndex++ ) {
postHookFunc = HPMHooks.list.HP_script_set_constant2_post[hIndex].func;
- postHookFunc(name, &value, &isparameter);
+ postHookFunc(name, &value, &is_parameter, &is_deprecated);
}
}
return;
diff --git a/src/plugins/dbghelpplug.c b/src/plugins/dbghelpplug.c
index edd47814d..6c02b1a12 100644
--- a/src/plugins/dbghelpplug.c
+++ b/src/plugins/dbghelpplug.c
@@ -1581,7 +1581,7 @@ typedef BOOL (WINAPI *ISDEBUGGERPRESENT)(void);
///
/// @return TRUE is a debugger is present
static BOOL
-Dhp__IsDebuggerPresent()
+Dhp__IsDebuggerPresent(void)
{
HANDLE kernel32_dll;
ISDEBUGGERPRESENT IsDebuggerPresent_;
@@ -1606,7 +1606,7 @@ Dhp__IsDebuggerPresent()
///
/// @return TRUE is sucessfull
static BOOL
-Dhp__LoadDbghelpDll()
+Dhp__LoadDbghelpDll(void)
{
dbghelp_dll = LoadLibraryA(DBGHELP_DLL);
if( dbghelp_dll != INVALID_HANDLE_VALUE )
@@ -1663,7 +1663,7 @@ Dhp__LoadDbghelpDll()
/// Unloads the dbghelp.dll library.
static VOID
-Dhp__UnloadDbghlpDll()
+Dhp__UnloadDbghlpDll(void)
{
if( !SymCleanup_(GetCurrentProcess()) )
printf("Failed to cleanup symbols! Error: %u\n", GetLastError());