mirror-games/glest-source
1
0
Fork 0
mirror of https://github.com/glest/glest-source.git synced 2025-09-03 04:52:34 +02:00
Code Issues Projects Releases Wiki Activity

- attempt to fix additional oos issues

Browse Source
This commit is contained in:
Mark Vejvoda
2013-09-28 16:53:20 +00:00
parent 939e88ce38
commit 8b8267400a
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
source/glest_game/world/unit_updater.cpp
View File

@@ -2211,7 +2211,7 @@ void UnitUpdater::hit(Unit *attacker, const AttackSkillType* ast, const Vec2i &t
scriptManager->onUnitAttacking(attacker); scriptManager->onUnitAttacking(attacker);
double distance = pci.getPos().dist(targetPos); double distance = pci.getPos().dist(targetPos);
distance = truncateDecimal<double>(distance); distance = truncateDecimal<double>(distance,16);
damage(attacker, ast, attacked, distance); damage(attacker, ast, attacked, distance);
} }
} }
@@ -2241,7 +2241,7 @@ void UnitUpdater::damage(Unit *attacker, const AttackSkillType* ast, Unit *attac
int var = ast->getAttackVar(); int var = ast->getAttackVar();
int armor = attacked->getType()->getTotalArmor(attacked->getTotalUpgrade()); int armor = attacked->getType()->getTotalArmor(attacked->getTotalUpgrade());
double damageMultiplier = world->getTechTree()->getDamageMultiplier(ast->getAttackType(), attacked->getType()->getArmorType()); double damageMultiplier = world->getTechTree()->getDamageMultiplier(ast->getAttackType(), attacked->getType()->getArmorType());
damageMultiplier = truncateDecimal<double>(damageMultiplier); damageMultiplier = truncateDecimal<double>(damageMultiplier,16);
//compute damage //compute damage
//damage += random.randRange(-var, var); //damage += random.randRange(-var, var);
@@ -2249,7 +2249,7 @@ void UnitUpdater::damage(Unit *attacker, const AttackSkillType* ast, Unit *attac
damage /= distance+1; damage /= distance+1;
damage -= armor; damage -= armor;
damage *= damageMultiplier; damage *= damageMultiplier;
damageMultiplier = truncateDecimal<double>(damageMultiplier); damageMultiplier = truncateDecimal<double>(damageMultiplier,16);
if(damage < 1) { if(damage < 1) {
damage= 1; damage= 1;