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

- fix bug reported on sf: Glest::Game::Selection::select crash with NULL pointer - ID: 3608835

This commit is contained in:
Mark Vejvoda 2013-03-24 04:43:50 +00:00
parent 15987d83d7
commit b2853b760e
1 changed files with 39 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

75
source/glest_game/gui/selection.cpp
View File

@ -45,45 +45,48 @@ bool Selection::select(Unit *unit) {
return result;
}
//check if already selected
for(int i=0; i < selectedUnits.size(); ++i) {
if(selectedUnits[i ]== unit) {
return true;
// Fix Bug reported on sourceforge.net: Glest::Game::Selection::select crash with NULL pointer - ID: 3608835
if(unit != NULL) {
//check if already selected
for(int i=0; i < selectedUnits.size(); ++i) {
if(selectedUnits[i ]== unit) {
return true;
}
}
//check if dead
if(unit->isDead()) {
return false;
}
//check if multisel
if(!unit->getType()->getMultiSelect() && !isEmpty()) {
return false;
}
//check if enemy
if(unit->getFactionIndex() != factionIndex && !isEmpty()) {
return false;
}
//check existing enemy
if(selectedUnits.size()==1 && selectedUnits.front()->getFactionIndex() != factionIndex) {
clear();
}
//check existing multisel
if(selectedUnits.size()==1 && !selectedUnits.front()->getType()->getMultiSelect()){
clear();
}
if(SystemFlags::getSystemSettingType(SystemFlags::debugSystem).enabled) SystemFlags::OutputDebug(SystemFlags::debugSystem,"In [%s::%s Line: %d] unit selected [%s]\n",__FILE__,__FUNCTION__,__LINE__,unit->toString().c_str());
unit->addObserver(this);
selectedUnits.push_back(unit);
result = true;
gui->onSelectionChanged();
}
//check if dead
if(unit->isDead()) {
return false;
}
//check if multisel
if(!unit->getType()->getMultiSelect() && !isEmpty()) {
return false;
}
//check if enemy
if(unit->getFactionIndex() != factionIndex && !isEmpty()) {
return false;
}
//check existing enemy
if(selectedUnits.size()==1 && selectedUnits.front()->getFactionIndex() != factionIndex) {
clear();
}
//check existing multisel
if(selectedUnits.size()==1 && !selectedUnits.front()->getType()->getMultiSelect()){
clear();
}
if(SystemFlags::getSystemSettingType(SystemFlags::debugSystem).enabled) SystemFlags::OutputDebug(SystemFlags::debugSystem,"In [%s::%s Line: %d] unit selected [%s]\n",__FILE__,__FUNCTION__,__LINE__,unit->toString().c_str());
unit->addObserver(this);
selectedUnits.push_back(unit);
result = true;
gui->onSelectionChanged();
return result;
}