From fc07549761b694ce903c788086fe4a57a606bf98 Mon Sep 17 00:00:00 2001
From: Mark Vejvoda <mark_vejvoda@hotmail.com>
Date: Mon, 15 Oct 2012 08:09:28 +0000
Subject: [PATCH] - allow connected client to see extraction process

---
 source/glest_game/global/lang.cpp                    | 6 ++++--
 source/glest_game/main/intro.cpp                     | 3 +--
 source/glest_game/menu/menu_state_connected_game.cpp | 3 ++-
 3 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/source/glest_game/global/lang.cpp b/source/glest_game/global/lang.cpp
index cdd14dc1..ac1c3d8b 100644
--- a/source/glest_game/global/lang.cpp
+++ b/source/glest_game/global/lang.cpp
@@ -507,7 +507,8 @@ bool Lang::fileMatchesISO630Code(string uselanguage, string testLanguageFile) {
 			result = true;
 		}
 	}
-	catch(const exception &ex) {
+	//catch(const exception &ex) {
+	catch(...) {
 	}
 
 	return result;
@@ -551,7 +552,8 @@ string Lang::getNativeLanguageName(string uselanguage, string testLanguageFile)
 	try {
 		result = stringsTest.getString("NativeLanguageName");
 	}
-	catch(const exception &ex) {
+	//catch(const exception &ex) {
+	catch(...) {
 	}
 
 	return result;
diff --git a/source/glest_game/main/intro.cpp b/source/glest_game/main/intro.cpp
index b6f2a7fb..fc5094f9 100644
--- a/source/glest_game/main/intro.cpp
+++ b/source/glest_game/main/intro.cpp
@@ -243,8 +243,7 @@ Intro::Intro(Program *program):
 				int index = rand() % models.size();
 				if(usedIndex.find(index) != usedIndex.end()) {
 					failedLookups++;
-					seed = (time(NULL) / failedLookups);
-					srand(seed.getCurTicks());
+					srand(seed.getCurTicks() / failedLookups);
 					continue;
 				}
 				//printf("picIndex = %d list count = %d\n",picIndex,coreData.getMiscTextureList().size());
diff --git a/source/glest_game/menu/menu_state_connected_game.cpp b/source/glest_game/menu/menu_state_connected_game.cpp
index 567265b1..816310d0 100644
--- a/source/glest_game/menu/menu_state_connected_game.cpp
+++ b/source/glest_game/menu/menu_state_connected_game.cpp
@@ -3223,7 +3223,8 @@ void MenuStateConnectedGame::FTPClient_CallbackEvent(string itemName,
     	else {
 			char *szBuf = (char *)userdata;
 			//printf("%s\n",szBuf);
-			console.addLine(szBuf);
+			//console.addLine(szBuf);
+			console.addLine(szBuf, false,"");
     	}
     }
     else if(type == ftp_cct_Map) {