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

- attempt to fix a segfault in grouped units

Browse Source
This commit is contained in:
Mark Vejvoda 2011-09-09 20:30:13 +00:00
parent 01d1f38a82
commit 15cad68faf
1 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
source/glest_game/type_instances/faction.cpp
View File

@ -50,16 +50,16 @@ bool CommandGroupSorter::compare(const CommandGroupSorter *l, const CommandGroup
bool CommandGroupSorter::operator< (const CommandGroupSorter &j) const {
bool result = false;
// If comparer if null or dead
// if(j.unit == NULL || j.unit->isAlive() == false) {
// // if source is null or dead also
// if((this->unit == NULL || this->unit->isAlive() == false)) {
// return false;
// }
// return true;
// }
// else if((this->unit == NULL || this->unit->isAlive() == false)) {
// return false;
// }
if(j.unit == NULL || j.unit->isAlive() == false) {
// if source is null or dead also
if((this->unit == NULL || this->unit->isAlive() == false)) {
return false;
}
return true;
}
else if((this->unit == NULL || this->unit->isAlive() == false)) {
return false;
}
Command *command= this->unit->getCurrrentCommandThreadSafe();
Command *commandPeer = j.unit->getCurrrentCommandThreadSafe();