mirror-games/glest-source
1
0
Fork 0
mirror of https://github.com/glest/glest-source.git synced 2025-08-21 07:31:21 +02:00
Code Issues Projects Releases Wiki Activity

fix for damage-all value="false" bug ( direct hit still hurt an ally unit, but splash doesn't )

Browse Source
This commit is contained in:
Titus Tscharntke
2010-02-24 23:25:32 +00:00
parent 96114d25e4
commit 3b02f9c9b7
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,7 +1,7 @@
// ============================================================== // ==============================================================
// This file is part of Glest (www.glest.org) // This file is part of Glest (www.glest.org)
// //
// Copyright (C) 2001-2008 Marti<74>o Figueroa // Copyright (C) 2001-2008 Marti<74>o Figueroa
// //
// You can redistribute this code and/or modify it under // You can redistribute this code and/or modify it under
// the terms of the GNU General Public License as published // the terms of the GNU General Public License as published
@@ -637,10 +637,14 @@ void UnitUpdater::hit(Unit *attacker, const AttackSkillType* ast, const Vec2i &t
while(pci.next()){ while(pci.next()){
Unit *attacked= map->getCell(pci.getPos())->getUnit(targetField); Unit *attacked= map->getCell(pci.getPos())->getUnit(targetField);
if(attacked!=NULL){ if(attacked!=NULL){
if(ast->getSplashDamageAll()
|| !attacker->isAlly(attacked)
|| ( targetPos.x==pci.getPos().x && targetPos.y==pci.getPos().y )){
damage(attacker, ast, attacked, pci.getPos().dist(attacker->getTargetPos())); damage(attacker, ast, attacked, pci.getPos().dist(attacker->getTargetPos()));
} }
} }
} }
}
else{ else{
Unit *attacked= map->getCell(targetPos)->getUnit(targetField); Unit *attacked= map->getCell(targetPos)->getUnit(targetField);
if(attacked!=NULL){ if(attacked!=NULL){