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

- allow connected client to see extraction process

This commit is contained in:
Mark Vejvoda 2012-10-15 08:09:28 +00:00
parent 052fd3373c
commit fc07549761
3 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
source/glest_game/global/lang.cpp
View File

@ -507,7 +507,8 @@ bool Lang::fileMatchesISO630Code(string uselanguage, string testLanguageFile) {
result = true; result = true;
} }
} }
catch(const exception &ex) { //catch(const exception &ex) {
catch(...) {
} }
return result; return result;
@ -551,7 +552,8 @@ string Lang::getNativeLanguageName(string uselanguage, string testLanguageFile)
try { try {
result = stringsTest.getString("NativeLanguageName"); result = stringsTest.getString("NativeLanguageName");
} }
catch(const exception &ex) { //catch(const exception &ex) {
catch(...) {
} }
return result; return result;

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

@ -243,8 +243,7 @@ Intro::Intro(Program *program):
int index = rand() % models.size(); int index = rand() % models.size();
if(usedIndex.find(index) != usedIndex.end()) { if(usedIndex.find(index) != usedIndex.end()) {
failedLookups++; failedLookups++;
seed = (time(NULL) / failedLookups); srand(seed.getCurTicks() / failedLookups);
srand(seed.getCurTicks());
continue; continue;
} }
//printf("picIndex = %d list count = %d\n",picIndex,coreData.getMiscTextureList().size()); //printf("picIndex = %d list count = %d\n",picIndex,coreData.getMiscTextureList().size());

3
source/glest_game/menu/menu_state_connected_game.cpp
View File

@ -3223,7 +3223,8 @@ void MenuStateConnectedGame::FTPClient_CallbackEvent(string itemName,
else { else {
char *szBuf = (char *)userdata; char *szBuf = (char *)userdata;
//printf("%s\n",szBuf); //printf("%s\n",szBuf);
console.addLine(szBuf); //console.addLine(szBuf);
console.addLine(szBuf, false,"");
} }
} }
else if(type == ftp_cct_Map) { else if(type == ftp_cct_Map) {