Rampoina
/
MegaGlest
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

next try

This commit is contained in:
Titus Tscharntke 2010-12-19 23:58:16 +00:00
parent 39eefa1e67
commit fa952efaf9
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1755,7 +1755,7 @@ bool UnitUpdater::unitOnRange(const Unit *unit, int range, Unit **rangedPtr,
//attack enemies that can attack first
for(int i = 0; i< enemies.size(); ++i) {
if(enemies[i]->getType()->hasSkillClass(scAttack)) {
if(enemies[i]->getType()->hasSkillClass(scAttack) && enemies[i]->isAlive() == true && !(unit->isAlly(enemies[i]))) {
*rangedPtr= enemies[i];
enemySeen=enemies[i];
result=true;
@ -1765,7 +1765,7 @@ bool UnitUpdater::unitOnRange(const Unit *unit, int range, Unit **rangedPtr,
//any enemy
for(int i = 0; i< enemies.size(); ++i) {
if(enemies[i]->isAlive() == true ) {
if(enemies[i]->isAlive() == true && !(unit->isAlly(enemies[i]))) {
*rangedPtr= enemies[i];
enemySeen=enemies[i];
result=true;
@ -1776,7 +1776,7 @@ bool UnitUpdater::unitOnRange(const Unit *unit, int range, Unit **rangedPtr,
if(result)
{
if(world->getFrameCount()-lastWarnFrameCount>10) //after 100 frames attack break we warn again
if(world->getFrameCount()-lastWarnFrameCount>100) //after 100 frames attack break we warn again
{
world->addAttackEffects(enemySeen);
SoundRenderer::getInstance().playFx(CoreData::getInstance().getAttentionSound());