mirror-games/glest-source
1
0
Fork 0
mirror of https://github.com/glest/glest-source.git synced 2025-08-18 06:01:17 +02:00
Code Issues Projects Releases Wiki Activity

- added guard for intro randomization to avoid forever loop

Browse Source
This commit is contained in:
Mark Vejvoda
2012-10-30 17:07:29 +00:00
parent 8b2e2bfd5d
commit 69b5f9b39c
1 changed files with 13 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
source/glest_game/main/intro.cpp
View File

@@ -434,7 +434,19 @@ Intro::Intro(Program *program):
if(usedIndex.find(picIndex) != usedIndex.end()) { if(usedIndex.find(picIndex) != usedIndex.end()) {
failedLookups++; failedLookups++;
srand(seed.getCurTicks() / failedLookups); srand(seed.getCurTicks() / failedLookups);
continue;
if(failedLookups > 10000) {
for(unsigned int i = 0;
i < coreData.getMiscTextureList().size(); ++i) {
if(usedIndex.find(i) == usedIndex.end()) {
picIndex = i;
break;
}
}
}
else {
continue;
}
} }
//printf("picIndex = %d list count = %d\n",picIndex,coreData.getMiscTextureList().size()); //printf("picIndex = %d list count = %d\n",picIndex,coreData.getMiscTextureList().size());
intoTexList.push_back(coreData.getMiscTextureList()[picIndex]); intoTexList.push_back(coreData.getMiscTextureList()[picIndex]);