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

ctNetworkCpuUltra was the problem ...

This commit is contained in:
Titus Tscharntke 2012-05-31 20:59:04 +00:00
parent 4a70d090a8
commit d6f04c66e0
1 changed files with 22 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2345,10 +2345,14 @@ bool UnitUpdater::unitOnRange(const Unit *unit, int range, Unit **rangedPtr,
}
//attack enemies that can attack first
float distToUnit=-1;
//TT float distToStandingUnit=-1;
Unit* enemySeen = NULL;
//TT Unit* attackingEnemySeen = NULL;
float distToUnit= -1;
float distToStandingUnit= -1;
Unit* enemySeen= NULL;
Unit* attackingEnemySeen= NULL;
ControlType controlType= unit->getFaction()->getControlType();
bool isUltra= controlType == ctCpuUltra || controlType == ctNetworkCpuUltra;
bool isMega= controlType == ctCpuMega || controlType == ctNetworkCpuMega;
for(int i = 0; i< enemies.size(); ++i) {
Unit *enemy = enemies[i];
@ -2370,54 +2374,26 @@ bool UnitUpdater::unitOnRange(const Unit *unit, int range, Unit **rangedPtr,
result = true;
}
//TT
// if(unit->getFaction()->getControlType()==ctCpuUltra ||
// unit->getFaction()->getControlType()==ctCpuMega) {
// if(distToStandingUnit < 0 || currentDist< distToStandingUnit) {
// if(enemies[i]->getCurrSkill()!=NULL && enemies[i]->getCurrSkill()->getClass()==scAttack) {
// distToStandingUnit = currentDist;
// attackingEnemySeen=enemies[i];
// }
// }
// }
//break;
if(isUltra || isMega) {
if(distToStandingUnit < 0 || currentDist< distToStandingUnit) {
if(enemies[i]->getCurrSkill()!=NULL && enemies[i]->getCurrSkill()->getClass()==scAttack) {
distToStandingUnit = currentDist;
attackingEnemySeen=enemies[i];
}
}
}
}
}
}
//TT if(unit->getFaction()->getControlType()==ctCpuUltra ||
// unit->getFaction()->getControlType()==ctCpuMega) {
// if( attackingEnemySeen!=NULL && random.randRange(0,2)!=2 ) {
// *rangedPtr = attackingEnemySeen;
// enemySeen = attackingEnemySeen;
// //printf("Da hat er wen gefunden:%s\n",enemySeen->getType()->getName(false).c_str());
// }
// }
/*
if(enemies[i]->getType()->hasSkillClass(scAttack) &&
enemies[i]->isAlive() == true ) {
*rangedPtr= enemies[i];
enemySeen=enemies[i];
result=true;
break;
}
if(isUltra || isMega) {
if( attackingEnemySeen!=NULL && random.randRange(0,2)!=2 ) {
*rangedPtr = attackingEnemySeen;
enemySeen = attackingEnemySeen;
//printf("Da hat er wen gefunden:%s\n",enemySeen->getType()->getName(false).c_str());
}
}
/*
if(result == false) {
//any enemy
for(int i= 0; i < enemies.size(); ++i) {
if(enemies[i]->isAlive() == true) {
*rangedPtr= enemies[i];
enemySeen= enemies[i];
result= true;
break;
}
}
}
*/
if(result == true) {
//const Unit* teamUnit = NULL;
const Unit* enemyUnit = NULL;