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

- added unit auto repair a buidling if the meeting point is on that building

This commit is contained in:
Mark Vejvoda 2013-02-12 03:41:59 +00:00
parent c0fe242504
commit a71c3d239f
1 changed files with 22 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
source/glest_game/type_instances/unit.cpp
View File

@ -1796,27 +1796,43 @@ const CommandType *Unit::computeCommandType(const Vec2i &pos, const Unit *target
throw megaglest_runtime_error(szBuf); throw megaglest_runtime_error(szBuf);
} }
if(targetUnit!=NULL){ if(targetUnit != NULL) {
//attack enemies //attack enemies
if(!isAlly(targetUnit)){ if(isAlly(targetUnit) == false) {
commandType= type->getFirstAttackCommand(targetUnit->getCurrField()); commandType= type->getFirstAttackCommand(targetUnit->getCurrField());
} }
//repair allies //repair allies
else{ else{
commandType= type->getFirstRepairCommand(targetUnit->getType()); commandType= type->getFirstRepairCommand(targetUnit->getType());
} }
} }
else{ else {
//check harvest command //check harvest command
Resource *resource= sc->getResource(); Resource *resource= sc->getResource();
if(resource!=NULL){ if(resource != NULL) {
commandType= type->getFirstHarvestCommand(resource->getType(),this->getFaction()); commandType= type->getFirstHarvestCommand(resource->getType(),this->getFaction());
} }
} }
// Check if we want to help build (repair) any buildings instead of just moving
if(targetUnit == NULL && commandType == NULL) {
const Vec2i unitTargetPos = pos;
Cell *cell= map->getCell(unitTargetPos);
if(cell != NULL && cell->getUnit(this->getCurrField()) != NULL) {
Unit *targetUnit = cell->getUnit(this->getCurrField());
if(targetUnit != NULL && targetUnit->getFactionIndex() == this->getFactionIndex() &&
(targetUnit->isBuilt() == false || targetUnit->isDamaged() == true)) {
const RepairCommandType *rct= this->getType()->getFirstRepairCommand(targetUnit->getType());
if(rct != NULL) {
commandType= type->getFirstRepairCommand(targetUnit->getType());
//printf("************ Unit will repair building built = %d, repair = %d\n",targetUnit->isBuilt(),targetUnit->isDamaged());
}
}
}
}
//default command is move command //default command is move command
if(commandType==NULL){ if(commandType == NULL) {
commandType= type->getFirstCtOfClass(ccMove); commandType= type->getFirstCtOfClass(ccMove);
} }