Ver Fonte

- Fixed battle_calc_weapon_attack damage capping damage to a minimum of 0 (negative values should be allowed when attack is absorbed by target's element)

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@6840 54d463be-8e91-2dee-dedb-b68131a5f0ec
skotlex há 19 anos atrás
pai
commit
4b668c4e82
2 ficheiros alterados com 10 adições e 6 exclusões
  1. 4 0
      Changelog-Trunk.txt
  2. 6 6
      src/map/battle.c

+ 4 - 0
Changelog-Trunk.txt

@@ -3,6 +3,10 @@ Date	Added
 AS OF SVN REV. 5091, WE ARE NOW USING TRUNK.  ALL UNTESTED BUGFIXES/FEATURES GO INTO TRUNK.
 IF YOU HAVE A WORKING AND TESTED BUGFIX PUT IT INTO STABLE AS WELL AS TRUNK.
 
+2006/05/30
+	* Fixed battle_calc_weapon_attack damage capping damage to a minimum of 0
+	  (negative values should be allowed when attack is absorbed by target's
+	  element) [Skotlex]
 2006/05/29
 	* [Fixed]:
 	  - Missing ';' in item #4358 [Lance]

+ 6 - 6
src/map/battle.c

@@ -1888,12 +1888,6 @@ static struct Damage battle_calc_weapon_attack(
 			}
 		}
 	}
-
-	if(!flag.rh || wd.damage<1)
-		wd.damage=0;
-	
-	if(!flag.lh || wd.damage2<1)
-		wd.damage2=0;
 	
 	if (sd)
 	{
@@ -1926,6 +1920,12 @@ static struct Damage battle_calc_weapon_attack(
 			flag.lh = 1;
 		}
 	}
+
+	if(!flag.rh && wd.damage)
+		wd.damage=0;
+	
+	if(!flag.lh && wd.damage2)
+		wd.damage2=0;
 	
 	if(wd.damage > 0 || wd.damage2 > 0)
 	{