mirror-games/glest-source
1
0
Fork 0
mirror of https://github.com/glest/glest-source.git synced 2025-08-30 11:19:48 +02:00
Code Issues Projects Releases Wiki Activity

- added guard against NULL commandtype clicking in icon panel (discovered during testing)

Browse Source
This commit is contained in:
Mark Vejvoda
2011-01-10 06:43:47 +00:00
parent b201cebf3b
commit 9b275a5077
2 changed files with 13 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
source/glest_game/gui/gui.cpp
View File

@@ -552,19 +552,20 @@ void Gui::clickCommonCommand(CommandClass commandClass){
} }
} }
void Gui::mouseDownDisplayUnitSkills(int posDisplay){ void Gui::mouseDownDisplayUnitSkills(int posDisplay) {
if(!selection.isEmpty()){ if(!selection.isEmpty()) {
if(posDisplay != cancelPos){ if(posDisplay != cancelPos) {
if(posDisplay!=meetingPointPos){ if(posDisplay!=meetingPointPos) {
const Unit *unit= selection.getFrontUnit(); const Unit *unit= selection.getFrontUnit();
//uniform selection //uniform selection
if(selection.isUniform()){ if(selection.isUniform()) {
if(unit->getFaction()->reqsOk(display.getCommandType(posDisplay))){ const CommandType *ct = display.getCommandType(posDisplay);
if(ct != NULL && unit->getFaction()->reqsOk(ct)) {
activeCommandType= display.getCommandType(posDisplay); activeCommandType= display.getCommandType(posDisplay);
activeCommandClass= activeCommandType->getClass(); activeCommandClass= activeCommandType->getClass();
} }
else{ else {
posDisplay= invalidPos; posDisplay= invalidPos;
activeCommandType= NULL; activeCommandType= NULL;
activeCommandClass= ccStop; activeCommandClass= ccStop;
@@ -573,7 +574,7 @@ void Gui::mouseDownDisplayUnitSkills(int posDisplay){
} }
//non uniform selection //non uniform selection
else{ else {
activeCommandType= NULL; activeCommandType= NULL;
activeCommandClass= display.getCommandClass(posDisplay); activeCommandClass= display.getCommandClass(posDisplay);
} }

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

@@ -213,6 +213,10 @@ int Faction::getCountForMaxUnitCount(const UnitType *unitType) const{
bool Faction::reqsOk(const CommandType *ct) const { bool Faction::reqsOk(const CommandType *ct) const {
assert(ct != NULL); assert(ct != NULL);
if(ct == NULL) {
throw runtime_error("In [Faction::reqsOk] ct == NULL");
}
if(ct->getProduced() != NULL && reqsOk(ct->getProduced()) == false) { if(ct->getProduced() != NULL && reqsOk(ct->getProduced()) == false) {
return false; return false;
} }