summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Changelog-Trunk.txt2
-rw-r--r--src/map/battle.c4
2 files changed, 4 insertions, 2 deletions
diff --git a/Changelog-Trunk.txt b/Changelog-Trunk.txt
index 288d6d4ea..a1669e5b1 100644
--- a/Changelog-Trunk.txt
+++ b/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]
diff --git a/src/map/battle.c b/src/map/battle.c
index fbe9fcfba..0376a2ac3 100644
--- a/src/map/battle.c
+++ b/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);