-AI can't command non-commandable units anymore
-Removed non-selectable
This commit is contained in:
parent
72828c39a3
commit
850a9a7dc0
|
@ -531,7 +531,7 @@ bool Ai::findAbleUnit(int *unitIndex, CommandClass ability, bool idleOnly){
|
|||
*unitIndex= -1;
|
||||
for(int i=0; i<aiInterface->getMyUnitCount(); ++i){
|
||||
const Unit *unit= aiInterface->getMyUnit(i);
|
||||
if(unit->getType()->hasCommandClass(ability)){
|
||||
if(unit->getType()->isCommandable() && unit->getType()->hasCommandClass(ability)){
|
||||
if(!idleOnly || !unit->anyCommand() || unit->getCurrCommand()->getCommandType()->getClass()==ccStop){
|
||||
units.push_back(i);
|
||||
}
|
||||
|
@ -553,6 +553,7 @@ vector<int> Ai::findUnitsHarvestingResourceType(const ResourceType *rt) {
|
|||
Map *map= aiInterface->getMap();
|
||||
for(int i = 0; i < aiInterface->getMyUnitCount(); ++i) {
|
||||
const Unit *unit= aiInterface->getMyUnit(i);
|
||||
if(unit->getType()->isCommandable()) {
|
||||
if(unit->getType()->hasCommandClass(ccHarvest)) {
|
||||
if(unit->anyCommand() && unit->getCurrCommand()->getCommandType()->getClass() == ccHarvest) {
|
||||
Command *command= unit->getCurrCommand();
|
||||
|
@ -605,6 +606,7 @@ vector<int> Ai::findUnitsHarvestingResourceType(const ResourceType *rt) {
|
|||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
return units;
|
||||
}
|
||||
|
@ -614,7 +616,7 @@ vector<int> Ai::findUnitsDoingCommand(CommandClass currentCommand) {
|
|||
|
||||
for(int i = 0; i < aiInterface->getMyUnitCount(); ++i) {
|
||||
const Unit *unit= aiInterface->getMyUnit(i);
|
||||
if(unit->getType()->hasCommandClass(currentCommand)) {
|
||||
if(unit->getType()->isCommandable() && unit->getType()->hasCommandClass(currentCommand)) {
|
||||
if(unit->anyCommand() && unit->getCurrCommand()->getCommandType()->getClass() == currentCommand) {
|
||||
units.push_back(i);
|
||||
}
|
||||
|
@ -630,7 +632,7 @@ bool Ai::findAbleUnit(int *unitIndex, CommandClass ability, CommandClass current
|
|||
*unitIndex= -1;
|
||||
for(int i=0; i<aiInterface->getMyUnitCount(); ++i){
|
||||
const Unit *unit= aiInterface->getMyUnit(i);
|
||||
if(unit->getType()->hasCommandClass(ability)){
|
||||
if(unit->getType()->isCommandable() && unit->getType()->hasCommandClass(ability)){
|
||||
if(unit->anyCommand() && unit->getCurrCommand()->getCommandType()->getClass()==currentCommand){
|
||||
units.push_back(i);
|
||||
}
|
||||
|
|
|
@ -71,12 +71,7 @@ bool Selection::select(Unit *unit) {
|
|||
return false;
|
||||
}
|
||||
|
||||
//check if selectable
|
||||
if(unit->getType()->isSelectable() == false) {
|
||||
return false;
|
||||
}
|
||||
|
||||
//check if selectable
|
||||
//check if commandable
|
||||
if(unit->getType()->isCommandable() == false && isEmpty() == false) {
|
||||
return false;
|
||||
}
|
||||
|
|
|
@ -89,7 +89,6 @@ UnitType::UnitType() : ProducibleType() {
|
|||
lightColor= Vec3f(0.f);
|
||||
light= false;
|
||||
multiSelect= false;
|
||||
selectable= true;
|
||||
commandable= true;
|
||||
armorType= NULL;
|
||||
rotatedBuildPos=0;
|
||||
|
@ -335,10 +334,6 @@ void UnitType::loaddd(int id,const string &dir, const TechTree *techTree,
|
|||
//multi selection
|
||||
multiSelect= parametersNode->getChild("multi-selection")->getAttribute("value")->getBoolValue();
|
||||
|
||||
//selectable
|
||||
if(parametersNode->hasChild("selectable")){
|
||||
selectable= parametersNode->getChild("selectable")->getAttribute("value")->getBoolValue();
|
||||
}
|
||||
//commandable
|
||||
if(parametersNode->hasChild("commandable")){
|
||||
commandable= parametersNode->getChild("commandable")->getAttribute("value")->getBoolValue();
|
||||
|
@ -1250,7 +1245,6 @@ std::string UnitType::toString() const {
|
|||
result += " light = " + intToStr(light);
|
||||
result += " lightColor = " + lightColor.getString();
|
||||
result += " multiSelect = " + intToStr(multiSelect);
|
||||
result += " selectable = " + intToStr(selectable);
|
||||
result += " commandable = " + intToStr(commandable);
|
||||
result += " sight = " + intToStr(sight);
|
||||
result += " size = " + intToStr(size);
|
||||
|
|
|
@ -171,7 +171,6 @@ private:
|
|||
bool light;
|
||||
Vec3f lightColor;
|
||||
bool multiSelect;
|
||||
bool selectable;
|
||||
bool commandable;
|
||||
int sight;
|
||||
int size; //size in cells
|
||||
|
@ -257,7 +256,6 @@ public:
|
|||
inline bool getRotationAllowed() const {return rotationAllowed;}
|
||||
inline Vec3f getLightColor() const {return lightColor;}
|
||||
inline bool getMultiSelect() const {return multiSelect;}
|
||||
inline bool isSelectable() const {return selectable;}
|
||||
inline bool isCommandable() const {return commandable;}
|
||||
inline int getSight() const {return sight;}
|
||||
inline int getSize() const {return size;}
|
||||
|
|
Loading…
Reference in New Issue