summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2014-12-26 14:57:05 +0300
committerAndrei Karas <akaras@inbox.ru>2014-12-26 20:27:15 +0300
commit82fe2325853829e737b023c6e6382c04ad140d00 (patch)
tree29f2ba42d7d14124cc16059f7992929496e1863c
parent7cc1daf0c11cddce59392263e19eefed42ee6e3a (diff)
downloadhercules-82fe2325853829e737b023c6e6382c04ad140d00.tar.gz
hercules-82fe2325853829e737b023c6e6382c04ad140d00.tar.bz2
hercules-82fe2325853829e737b023c6e6382c04ad140d00.tar.xz
hercules-82fe2325853829e737b023c6e6382c04ad140d00.zip
Update HPM hooks after commit 6dd08befa6064a652d0d98e7cb85f0e353992dd5.
-rw-r--r--src/plugins/HPMHooking/HPMHooking_map.HPMHooksCore.inc8
-rw-r--r--src/plugins/HPMHooking/HPMHooking_map.HookingPoints.inc2
-rw-r--r--src/plugins/HPMHooking/HPMHooking_map.Hooks.inc14
3 files changed, 12 insertions, 12 deletions
diff --git a/src/plugins/HPMHooking/HPMHooking_map.HPMHooksCore.inc b/src/plugins/HPMHooking/HPMHooking_map.HPMHooksCore.inc
index 88f2a4575..034b14b79 100644
--- a/src/plugins/HPMHooking/HPMHooking_map.HPMHooksCore.inc
+++ b/src/plugins/HPMHooking/HPMHooking_map.HPMHooksCore.inc
@@ -829,8 +829,8 @@ struct {
struct HPMHookPoint *HP_clif_specialeffect_value_post;
struct HPMHookPoint *HP_clif_millenniumshield_pre;
struct HPMHookPoint *HP_clif_millenniumshield_post;
- struct HPMHookPoint *HP_clif_charm_pre;
- struct HPMHookPoint *HP_clif_charm_post;
+ struct HPMHookPoint *HP_clif_spiritcharm_pre;
+ struct HPMHookPoint *HP_clif_spiritcharm_post;
struct HPMHookPoint *HP_clif_charm_single_pre;
struct HPMHookPoint *HP_clif_charm_single_post;
struct HPMHookPoint *HP_clif_snap_pre;
@@ -5912,8 +5912,8 @@ struct {
int HP_clif_specialeffect_value_post;
int HP_clif_millenniumshield_pre;
int HP_clif_millenniumshield_post;
- int HP_clif_charm_pre;
- int HP_clif_charm_post;
+ int HP_clif_spiritcharm_pre;
+ int HP_clif_spiritcharm_post;
int HP_clif_charm_single_pre;
int HP_clif_charm_single_post;
int HP_clif_snap_pre;
diff --git a/src/plugins/HPMHooking/HPMHooking_map.HookingPoints.inc b/src/plugins/HPMHooking/HPMHooking_map.HookingPoints.inc
index aca88dbaf..21f48134c 100644
--- a/src/plugins/HPMHooking/HPMHooking_map.HookingPoints.inc
+++ b/src/plugins/HPMHooking/HPMHooking_map.HookingPoints.inc
@@ -424,7 +424,7 @@ struct HookingPointData HookingPoints[] = {
{ HP_POP(clif->specialeffect_single, HP_clif_specialeffect_single) },
{ HP_POP(clif->specialeffect_value, HP_clif_specialeffect_value) },
{ HP_POP(clif->millenniumshield, HP_clif_millenniumshield) },
- { HP_POP(clif->spiritcharm, HP_clif_charm) },
+ { HP_POP(clif->spiritcharm, HP_clif_spiritcharm) },
{ HP_POP(clif->charm_single, HP_clif_charm_single) },
{ HP_POP(clif->snap, HP_clif_snap) },
{ HP_POP(clif->weather_check, HP_clif_weather_check) },
diff --git a/src/plugins/HPMHooking/HPMHooking_map.Hooks.inc b/src/plugins/HPMHooking/HPMHooking_map.Hooks.inc
index c2e0f4a2f..9078efe2e 100644
--- a/src/plugins/HPMHooking/HPMHooking_map.Hooks.inc
+++ b/src/plugins/HPMHooking/HPMHooking_map.Hooks.inc
@@ -11012,13 +11012,13 @@ void HP_clif_millenniumshield(struct block_list *bl, short shields) {
}
return;
}
-void HP_clif_charm(struct map_session_data *sd, short type) {
+void HP_clif_spiritcharm(struct map_session_data *sd, short type) {
int hIndex = 0;
- if( HPMHooks.count.HP_clif_charm_pre ) {
+ if( HPMHooks.count.HP_clif_spiritcharm_pre ) {
void (*preHookFunc) (struct map_session_data *sd, short *type);
*HPMforce_return = false;
- for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_charm_pre; hIndex++ ) {
- preHookFunc = HPMHooks.list.HP_clif_charm_pre[hIndex].func;
+ for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_spiritcharm_pre; hIndex++ ) {
+ preHookFunc = HPMHooks.list.HP_clif_spiritcharm_pre[hIndex].func;
preHookFunc(sd, &type);
}
if( *HPMforce_return ) {
@@ -11029,10 +11029,10 @@ void HP_clif_charm(struct map_session_data *sd, short type) {
{
HPMHooks.source.clif.spiritcharm(sd, type);
}
- if( HPMHooks.count.HP_clif_charm_post ) {
+ if( HPMHooks.count.HP_clif_spiritcharm_post ) {
void (*postHookFunc) (struct map_session_data *sd, short *type);
- for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_charm_post; hIndex++ ) {
- postHookFunc = HPMHooks.list.HP_clif_charm_post[hIndex].func;
+ for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_spiritcharm_post; hIndex++ ) {
+ postHookFunc = HPMHooks.list.HP_clif_spiritcharm_post[hIndex].func;
postHookFunc(sd, &type);
}
}