mirror-games/glest-source
1
0
Fork 0
mirror of https://github.com/glest/glest-source.git synced 2025-02-24 19:52:25 +01:00
Code Issues Projects Releases Wiki Activity

Merge branch 'feature/sdl2' of https://github.com/MegaGlest/megaglest-source into feature/sdl2

Browse Source
This commit is contained in:
SoftCoder 2015-10-26 15:46:55 -07:00
commit 51aa3c5690
2 changed files with 22 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
data/glest_game

@ -1 +1 @@
Subproject commit 736113a2b4b883722279942e11e63bdb414fe39f
Subproject commit bf04854ade7cd0fc51483c857e590acfef4fbc26

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

@ -853,8 +853,27 @@ void Gui::computeDisplay(){
}
//portraits
for(int i= 0; i < selection.getCount(); ++i){
display.setUpImage(i, selection.getUnit(i)->getType()->getImage());
int unitIndex = 0;
for(unitIndex = 0; unitIndex < selection.getCount(); ++unitIndex){
try {
const Unit *unit = selection.getUnit(unitIndex);
if(unit == NULL) {
throw megaglest_runtime_error("unit == NULL");
}
if(unit->getType() == NULL) {
throw megaglest_runtime_error("unit->getType() == NULL");
}
if(unit->getType()->getImage() == NULL) {
throw megaglest_runtime_error("unit->getType()->getImage()");
}
display.setUpImage(unitIndex, unit->getType()->getImage());
}
catch(exception &ex) {
char szBuf[8096]="";
snprintf(szBuf,8096,"Error in unit selection for index: %d error [%s]",unitIndex,ex.what());
throw megaglest_runtime_error(szBuf, true);
}
}
// ================ PART 2 ================