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

- bugfix for validation (Accidentally removed morph command check)

This commit is contained in:
Mark Vejvoda 2012-10-15 06:13:08 +00:00
parent b65bdee592
commit 0c7d089b93
1 changed files with 14 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
source/glest_game/types/faction_type.cpp
View File

@ -561,6 +561,18 @@ std::vector<std::string> FactionType::validateFactionType() {
break;
}
}
// Check if this is a morph command
if(cmdType->getClass() == ccMorph) {
const MorphCommandType *morph = dynamic_cast<const MorphCommandType *>(cmdType);
const UnitType *morphUnit = morph->getMorphUnit();
if( morphUnit != NULL &&
unitType.getId() != unitType2.getId() &&
unitType.getName() == morphUnit->getName()) {
foundUnit = true;
break;
}
}
// Check if this is an attack command with spawned units on attack
if(cmdType->getClass() == ccAttack) {
@ -580,6 +592,8 @@ std::vector<std::string> FactionType::validateFactionType() {
}
if(foundUnit == false) {
//printf("Problem for unit [%s] unitTypes.size() = %lu\n",unitType.getName().c_str(),unitTypes.size());
char szBuf[4096]="";
sprintf(szBuf,"The Unit [%s] in Faction [%s] has no other units that can produce, build or morph into it in this faction!",unitType.getName().c_str(),this->getName().c_str());
results.push_back(szBuf);