- Spirit of Sin and Enchant Deadly Poison now stack.

- Fixed skill damage card bonuses not working on magic skills.
- Moved the setting of sd->npc_id = 0 in npc_dequeue to the beginning, since this function is called when a script is cancelled (TODO: but when this happens, shouldn't the previously ongoing script also be free'd?)
- Made homunc's speed be recalculated when you respawn it from rest state.


git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@9453 54d463be-8e91-2dee-dedb-b68131a5f0ec

1 files changed, 7 insertions, 7 deletions

diff --git a/src/map/pc.c b/src/map/pc.c
index c5128bd79..e6ae6c8af 100644
--- a/src/map/pc.c
+++ b/src/map/pc.c
@@ -2136,19 +2136,19 @@ int pc_bonus2(struct map_session_data *sd,int type,int type2,int val)
 				ATF_SHORT|ATF_TARGET);
 		break;
 	case SP_SKILL_ATK:
+		if(sd->state.lr_flag == 2)
+			break;
 		for (i = 0; i < MAX_PC_BONUS && sd->skillatk[i].id != 0 && sd->skillatk[i].id != type2; i++);
 		if (i == MAX_PC_BONUS)
 		{	//Better mention this so the array length can be updated. [Skotlex]
 			ShowDebug("run_script: bonus2 bSkillAtk reached it's limit (%d skills per character), bonus skill %d (+%d%%) lost.\n", MAX_PC_BONUS, type2, val);
 			break;
 		}
-		if(sd->state.lr_flag != 2) {
-			if (sd->skillatk[i].id == type2)
-				sd->skillatk[i].val += val;
-			else {
-				sd->skillatk[i].id = type2;
-				sd->skillatk[i].val = val;
-			}
+		if (sd->skillatk[i].id == type2)
+			sd->skillatk[i].val += val;
+		else {
+			sd->skillatk[i].id = type2;
+			sd->skillatk[i].val = val;
 		}
 		break;
 	case SP_ADD_SKILL_BLOW: