summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Changelog-Trunk.txt2
-rw-r--r--src/map/battle.c4
2 files changed, 5 insertions, 1 deletions
diff --git a/Changelog-Trunk.txt b/Changelog-Trunk.txt
index 16927dacc..d154d432c 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/07/13
+ * Reverted temporarily the Cart Termination equation until it can be
+ fixed... [Skotlex]
* Fixed script command "recovery". [Skotlex]
2006/07/12
* Fixed a small typo in my code [Zido]
diff --git a/src/map/battle.c b/src/map/battle.c
index dacfbe015..cee888fe0 100644
--- a/src/map/battle.c
+++ b/src/map/battle.c
@@ -1426,7 +1426,9 @@ static struct Damage battle_calc_weapon_attack(
if (i < 1) i = 1;
//Preserve damage ratio when max cart weight is changed.
if(sd && sd->cart_weight && sd->cart_max_weight)
- skillratio += (sd->cart_weight * 80000) / (i * sd->cart_max_weight) - 100;
+// FIXME: Something is wrong with this check! But what...? [Skotlex]
+// skillratio += (sd->cart_weight * 80000) / (i * sd->cart_max_weight) - 100;
+ skillratio += sd->cart_weight/i - 100;
else if (!sd)
skillratio += 80000 / i - 100;
flag.cardfix = 0;