From 5f11a4f710216e4abefaf6b4ffb032b3a62bfce1 Mon Sep 17 00:00:00 2001 From: "Hercules.ws" Date: Sun, 21 Sep 2014 06:15:44 +0200 Subject: HPM Hooks Update Signed-off-by: HerculesWSAPI --- src/plugins/HPMHooking/HPMHooking.HPMHooksCore.inc | 4 ++++ .../HPMHooking/HPMHooking.HookingPoints.inc | 1 + src/plugins/HPMHooking/HPMHooking.Hooks.inc | 26 ++++++++++++++++++++++ 3 files changed, 31 insertions(+) (limited to 'src') diff --git a/src/plugins/HPMHooking/HPMHooking.HPMHooksCore.inc b/src/plugins/HPMHooking/HPMHooking.HPMHooksCore.inc index d73525b70..feb929dbc 100644 --- a/src/plugins/HPMHooking/HPMHooking.HPMHooksCore.inc +++ b/src/plugins/HPMHooking/HPMHooking.HPMHooksCore.inc @@ -977,6 +977,8 @@ struct { struct HPMHookPoint *HP_clif_party_show_picker_post; struct HPMHookPoint *HP_clif_partyinvitationstate_pre; struct HPMHookPoint *HP_clif_partyinvitationstate_post; + struct HPMHookPoint *HP_clif_PartyLeaderChanged_pre; + struct HPMHookPoint *HP_clif_PartyLeaderChanged_post; struct HPMHookPoint *HP_clif_guild_created_pre; struct HPMHookPoint *HP_clif_guild_created_post; struct HPMHookPoint *HP_clif_guild_belonginfo_pre; @@ -6014,6 +6016,8 @@ struct { int HP_clif_party_show_picker_post; int HP_clif_partyinvitationstate_pre; int HP_clif_partyinvitationstate_post; + int HP_clif_PartyLeaderChanged_pre; + int HP_clif_PartyLeaderChanged_post; int HP_clif_guild_created_pre; int HP_clif_guild_created_post; int HP_clif_guild_belonginfo_pre; diff --git a/src/plugins/HPMHooking/HPMHooking.HookingPoints.inc b/src/plugins/HPMHooking/HPMHooking.HookingPoints.inc index 05d484d20..7c6e6305b 100644 --- a/src/plugins/HPMHooking/HPMHooking.HookingPoints.inc +++ b/src/plugins/HPMHooking/HPMHooking.HookingPoints.inc @@ -498,6 +498,7 @@ struct HookingPointData HookingPoints[] = { { HP_POP(clif->party_xy_remove, HP_clif_party_xy_remove) }, { HP_POP(clif->party_show_picker, HP_clif_party_show_picker) }, { HP_POP(clif->partyinvitationstate, HP_clif_partyinvitationstate) }, + { HP_POP(clif->PartyLeaderChanged, HP_clif_PartyLeaderChanged) }, { HP_POP(clif->guild_created, HP_clif_guild_created) }, { HP_POP(clif->guild_belonginfo, HP_clif_guild_belonginfo) }, { HP_POP(clif->guild_masterormember, HP_clif_guild_masterormember) }, diff --git a/src/plugins/HPMHooking/HPMHooking.Hooks.inc b/src/plugins/HPMHooking/HPMHooking.Hooks.inc index 8f209fe5c..4cc8bbf18 100644 --- a/src/plugins/HPMHooking/HPMHooking.Hooks.inc +++ b/src/plugins/HPMHooking/HPMHooking.Hooks.inc @@ -12937,6 +12937,32 @@ void HP_clif_partyinvitationstate(struct map_session_data *sd) { } return; } +void HP_clif_PartyLeaderChanged(struct map_session_data *sd, int prev_leader_aid, int new_leader_aid) { + int hIndex = 0; + if( HPMHooks.count.HP_clif_PartyLeaderChanged_pre ) { + void (*preHookFunc) (struct map_session_data *sd, int *prev_leader_aid, int *new_leader_aid); + *HPMforce_return = false; + for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_PartyLeaderChanged_pre; hIndex++ ) { + preHookFunc = HPMHooks.list.HP_clif_PartyLeaderChanged_pre[hIndex].func; + preHookFunc(sd, &prev_leader_aid, &new_leader_aid); + } + if( *HPMforce_return ) { + *HPMforce_return = false; + return; + } + } + { + HPMHooks.source.clif.PartyLeaderChanged(sd, prev_leader_aid, new_leader_aid); + } + if( HPMHooks.count.HP_clif_PartyLeaderChanged_post ) { + void (*postHookFunc) (struct map_session_data *sd, int *prev_leader_aid, int *new_leader_aid); + for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_PartyLeaderChanged_post; hIndex++ ) { + postHookFunc = HPMHooks.list.HP_clif_PartyLeaderChanged_post[hIndex].func; + postHookFunc(sd, &prev_leader_aid, &new_leader_aid); + } + } + return; +} void HP_clif_guild_created(struct map_session_data *sd, int flag) { int hIndex = 0; if( HPMHooks.count.HP_clif_guild_created_pre ) { -- cgit v1.2.3-70-g09d2 From 0f13e7e1ddc6b3e864ff74de4de97919bf02c1a8 Mon Sep 17 00:00:00 2001 From: Michieru Date: Sun, 21 Sep 2014 10:28:02 +0200 Subject: Fix Switching arrows no longer stops attacks. (rathena: a080117a74bd) --- src/map/clif.c | 1 - 1 file changed, 1 deletion(-) (limited to 'src') diff --git a/src/map/clif.c b/src/map/clif.c index 6838a8021..f6ab3f444 100644 --- a/src/map/clif.c +++ b/src/map/clif.c @@ -3432,7 +3432,6 @@ void clif_arrowequip(struct map_session_data *sd,int val) nullpo_retv(sd); - pc_stop_attack(sd); // [Valaris] #if PACKETVER >= 20121128 clif->status_change(&sd->bl, SI_CLIENT_ONLY_EQUIP_ARROW, 1, INVALID_TIMER, 0, 0, 0); #endif -- cgit v1.2.3-70-g09d2 From 0773ec5e92dc7b44cc6f32f134d77d950c20d521 Mon Sep 17 00:00:00 2001 From: Michieru Date: Sun, 21 Sep 2014 13:16:20 +0200 Subject: Using Hovering should off-set the effect of Magnetic Field (bug:8022) --- src/map/unit.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src') diff --git a/src/map/unit.c b/src/map/unit.c index 1f81e0d2f..36eed87fe 100644 --- a/src/map/unit.c +++ b/src/map/unit.c @@ -930,7 +930,7 @@ int unit_can_move(struct block_list *bl) { || sc->data[SC_ELECTRICSHOCKER] || sc->data[SC_WUGBITE] || sc->data[SC_THORNS_TRAP] - || sc->data[SC_MAGNETICFIELD] + || ( sc->data[SC_MAGNETICFIELD] && !sc->data[SC_HOVERING] ) || sc->data[SC__MANHOLE] || sc->data[SC_CURSEDCIRCLE_ATKER] || sc->data[SC_CURSEDCIRCLE_TARGET] -- cgit v1.2.3-70-g09d2