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

fixed asura targetting, bugreport:5052

Browse Source 
fixed a typo in a bug report number, for bugreport:4629

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@15136 54d463be-8e91-2dee-dedb-b68131a5f0ec
This commit is contained in:
shennetsind 2011-12-15 20:32:06 +00:00
parent 37a52df4a1
commit d7a7f60dde
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/map/pc.h
View File

@ -452,7 +452,7 @@ struct map_session_data {
#endif
/**
* Guarantees your friend request is legit (for bugreport:6429)
* Guarantees your friend request is legit (for bugreport:4629)
**/
int friend_req;

6
src/map/unit.c
View File

@ -1019,7 +1019,7 @@ int unit_skilluse_id2(struct block_list *src, int target_id, short skill_num, sh
sc = NULL; //Unneeded
//temp: used to signal combo-skills right now.
if (sc && sc->data[SC_COMBO] && sc->data[SC_COMBO]->val1 == skill_num)
if (sc && sc->data[SC_COMBO] && (sc->data[SC_COMBO]->val1 == skill_num || skill_num == MO_EXTREMITYFIST))
{
if (sc->data[SC_COMBO]->val2)
target_id = sc->data[SC_COMBO]->val2;
@ -1027,9 +1027,9 @@ int unit_skilluse_id2(struct block_list *src, int target_id, short skill_num, sh
target_id = ud->target;
temp = 1;
} else
if ( target_id == src->id && (
if ( target_id == src->id &&
skill_get_inf(skill_num)&INF_SELF_SKILL &&
skill_get_inf2(skill_num)&INF2_NO_TARGET_SELF ) || skill_num == MO_EXTREMITYFIST ) //Asura due to combo.
skill_get_inf2(skill_num)&INF2_NO_TARGET_SELF )
{
target_id = ud->target; //Auto-select target. [Skotlex]
temp = 1;