Mirroristas/rathena
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Cleaned up a few TODOs from #7963 (#8254)

Browse Source
This commit is contained in:
Lemongrass3110
2024-05-02 22:44:31 +02:00
committed by GitHub
parent 6d2ef66bbb
commit 827517f8cf
16 changed files with 788 additions and 876 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/map/unit.cpp
View File

@@ -1646,7 +1646,7 @@ int unit_skilluse_id2(struct block_list *src, int target_id, uint16 skill_id, ui
if (sc && sc->getSCE(SC_COMBO) &&
skill_is_combo(skill_id) &&
(sc->getSCE(SC_COMBO)->val1 == skill_id ||
(sd?skill_check_condition_castbegin(sd,skill_id,skill_lv):0) )) {
(sd?skill_check_condition_castbegin(*sd,skill_id,skill_lv):0) )) {
if (skill_is_combo(skill_id) == 2 && target_id == src->id && ud->target > 0)
target_id = ud->target;
else if (sc->getSCE(SC_COMBO)->val2)
@@ -1665,7 +1665,7 @@ int unit_skilluse_id2(struct block_list *src, int target_id, uint16 skill_id, ui
if (sd) {
// Target_id checking.
if(skill_isNotOk(skill_id, sd))
if(skill_isNotOk(skill_id, *sd))
return 0;
switch(skill_id) { // Check for skills that auto-select target
@@ -1848,7 +1848,7 @@ int unit_skilluse_id2(struct block_list *src, int target_id, uint16 skill_id, ui
break;
}
if (!skill_check_condition_castbegin(sd, skill_id, skill_lv))
if (!skill_check_condition_castbegin(*sd, skill_id, skill_lv))
return 0;
}
@@ -2161,7 +2161,7 @@ int unit_skilluse_pos2( struct block_list *src, short skill_x, short skill_y, ui
return 0;
if( sd ) {
if( skill_isNotOk(skill_id, sd) || !skill_check_condition_castbegin(sd, skill_id, skill_lv) )
if( skill_isNotOk(skill_id, *sd) || !skill_check_condition_castbegin(*sd, skill_id, skill_lv) )
return 0;
if (skill_id == MG_FIREWALL && !skill_pos_maxcount_check(src, skill_x, skill_y, skill_id, skill_lv, BL_PC, true))
return 0; // Special check for Firewall only