mirror-games/glest-source
1
0
Fork 0
mirror of https://github.com/glest/glest-source.git synced 2025-09-02 04:22:32 +02:00
Code Issues Projects Releases Wiki Activity

loading screens for scenarios too

Browse Source
This commit is contained in:
Titus Tscharntke
2010-04-05 20:16:49 +00:00
parent 86a9bc0c84
commit c525407904
1 changed files with 33 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

55
source/glest_game/game/game.cpp
View File

@@ -85,6 +85,7 @@ void Game::load(){
string tilesetName= gameSettings.getTileset(); string tilesetName= gameSettings.getTileset();
string techName= gameSettings.getTech(); string techName= gameSettings.getTech();
string scenarioName= gameSettings.getScenario(); string scenarioName= gameSettings.getScenario();
bool scenarioLoadingImageUsed=false;
logger.setState(Lang::getInstance().get("Loading")); logger.setState(Lang::getInstance().get("Loading"));
@@ -104,33 +105,43 @@ void Game::load(){
scenarioDir = scenarioDir.erase(scenarioDir.size() - 4, 4); scenarioDir = scenarioDir.erase(scenarioDir.size() - 4, 4);
scenarioDir = scenarioDir.erase(scenarioDir.size() - gameSettings.getScenario().size(), gameSettings.getScenario().size() + 1); scenarioDir = scenarioDir.erase(scenarioDir.size() - gameSettings.getScenario().size(), gameSettings.getScenario().size() + 1);
} }
// use a scenario based loading screen
string senarioLogo = scenarioDir + "/" + "loading_screen.jpg";
if(fileExists(senarioLogo) == true) {
SystemFlags::OutputDebug(SystemFlags::debugSystem,"In [%s::%s] found loading screen '%s'\n",__FILE__,__FUNCTION__,senarioLogo.c_str());
logger.loadLoadingScreen(senarioLogo);
scenarioLoadingImageUsed=true;
}
SystemFlags::OutputDebug(SystemFlags::debugSystem,"In [%s::%s Line: %d] gameSettings.getScenarioDir() = [%s] gameSettings.getScenario() = [%s] scenarioDir = [%s]\n",__FILE__,__FUNCTION__,__LINE__,gameSettings.getScenarioDir().c_str(),gameSettings.getScenario().c_str(),scenarioDir.c_str()); SystemFlags::OutputDebug(SystemFlags::debugSystem,"In [%s::%s Line: %d] gameSettings.getScenarioDir() = [%s] gameSettings.getScenario() = [%s] scenarioDir = [%s]\n",__FILE__,__FUNCTION__,__LINE__,gameSettings.getScenarioDir().c_str(),gameSettings.getScenario().c_str(),scenarioDir.c_str());
} }
SystemFlags::OutputDebug(SystemFlags::debugSystem,"In [%s::%s] Searching for loading screen\n",__FILE__,__FUNCTION__); SystemFlags::OutputDebug(SystemFlags::debugSystem,"In [%s::%s] Searching for loading screen\n",__FILE__,__FUNCTION__);
for ( int i=0; i < gameSettings.getFactionCount(); ++i ) { if(!scenarioLoadingImageUsed){
if(gameSettings.getFactionControl(i)==ctHuman){ // try to use a faction related loading screen
vector<string> pathList=config.getPathListForType(ptTechs,scenarioDir); for ( int i=0; i < gameSettings.getFactionCount(); ++i ) {
for(int idx = 0; idx < pathList.size(); idx++) { if(gameSettings.getFactionControl(i)==ctHuman){
const string path = pathList[idx]+ "/" +techName+ "/"+ "factions"+ "/"+ gameSettings.getFactionTypeName(i); vector<string> pathList=config.getPathListForType(ptTechs,scenarioDir);
SystemFlags::OutputDebug(SystemFlags::debugSystem,"In [%s::%s] possible loading screen dir '%s'\n",__FILE__,__FUNCTION__,path.c_str()); for(int idx = 0; idx < pathList.size(); idx++) {
if(isdir(path.c_str()) == true) { const string path = pathList[idx]+ "/" +techName+ "/"+ "factions"+ "/"+ gameSettings.getFactionTypeName(i);
string factionLogo = path + "/" + "loading_screen.tga"; SystemFlags::OutputDebug(SystemFlags::debugSystem,"In [%s::%s] possible loading screen dir '%s'\n",__FILE__,__FUNCTION__,path.c_str());
if(isdir(path.c_str()) == true) {
SystemFlags::OutputDebug(SystemFlags::debugSystem,"In [%s::%s] looking for loading screen '%s'\n",__FILE__,__FUNCTION__,factionLogo.c_str()); string factionLogo = path + "/" + "loading_screen.jpg";
if(fileExists(factionLogo) == true) { SystemFlags::OutputDebug(SystemFlags::debugSystem,"In [%s::%s] looking for loading screen '%s'\n",__FILE__,__FUNCTION__,factionLogo.c_str());
SystemFlags::OutputDebug(SystemFlags::debugSystem,"In [%s::%s] found loading screen '%s'\n",__FILE__,__FUNCTION__,factionLogo.c_str());
if(fileExists(factionLogo) == true) {
logger.loadLoadingScreen(factionLogo); SystemFlags::OutputDebug(SystemFlags::debugSystem,"In [%s::%s] found loading screen '%s'\n",__FILE__,__FUNCTION__,factionLogo.c_str());
break;
} logger.loadLoadingScreen(factionLogo);
} break;
} }
break; }
} }
} break;
}
}
}