Bladeren bron

- Fixed the atk_rate (Turtle General Card) bonus not working on dual-wielders.

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@8354 54d463be-8e91-2dee-dedb-b68131a5f0ec
skotlex 19 jaren geleden
bovenliggende
commit
56cb3651d6
2 gewijzigde bestanden met toevoegingen van 4 en 2 verwijderingen
  1. 2 0
      Changelog-Trunk.txt
  2. 2 2
      src/map/battle.c

+ 2 - 0
Changelog-Trunk.txt

@@ -4,6 +4,8 @@ AS OF SVN REV. 5091, WE ARE NOW USING TRUNK.  ALL UNTESTED BUGFIXES/FEATURES GO
 IF YOU HAVE A WORKING AND TESTED BUGFIX PUT IT INTO STABLE AS WELL AS TRUNK.
 
 2006/08/18
+	* Fixed the atk_rate (Turtle General Card) bonus not working on
+	  dual-wielders. [Skotlex]
 	* Made HLIF_HEAL a self skill that auto-selects target to caster's master.
 	  [Skotlex]
 	* Implemented SC_BLOODLUST and SC_CHANGE, cleaned up HLIF_CHANGE [Skotlex]

+ 2 - 2
src/map/battle.c

@@ -1230,8 +1230,8 @@ static struct Damage battle_calc_weapon_attack(
 				//Add any bonuses that modify the base baseatk+watk (pre-skills)
 				if(sd)
 				{
-					if (sd->status.weapon < MAX_WEAPON_TYPE && (sd->atk_rate != 100 || sd->weapon_atk_rate[sd->status.weapon] != 0))
-						ATK_RATE(sd->atk_rate + sd->weapon_atk_rate[sd->status.weapon]);
+					if ((sd->atk_rate != 100 || sd->weapon_atk_rate[sd->weapontype1] != 0))
+						ATK_RATE(sd->atk_rate + sd->weapon_atk_rate[sd->weapontype1]);
 
 					if(flag.cri && sd->crit_atk_rate)
 						ATK_ADDRATE(sd->crit_atk_rate);