From b809ea22337499a1bcccf224b3fcdec751eb8a6a Mon Sep 17 00:00:00 2001 From: titiger Date: Tue, 9 Feb 2016 00:48:35 +0100 Subject: [PATCH] Proof that you are ready for internet games --- data/glest_game | 2 +- source/glest_game/main/battle_end.cpp | 13 +++++++++++++ source/glest_game/menu/menu_state_new_game.cpp | 12 +++++++++++- 3 files changed, 25 insertions(+), 2 deletions(-) diff --git a/data/glest_game b/data/glest_game index c256b6919..b3fab75a9 160000 --- a/data/glest_game +++ b/data/glest_game @@ -1 +1 @@ -Subproject commit c256b69196d8aae7f00b833e75d6acdcb73953b0 +Subproject commit b3fab75a92e85a2bb0f1b2349313aac6f4b6fd6f diff --git a/source/glest_game/main/battle_end.cpp b/source/glest_game/main/battle_end.cpp index 045d46b38..d44899f2c 100644 --- a/source/glest_game/main/battle_end.cpp +++ b/source/glest_game/main/battle_end.cpp @@ -73,6 +73,19 @@ BattleEnd::BattleEnd(Program *program, const Stats *stats,ProgramState *originSt SystemFlags::OutputDebug(SystemFlags::debugSystem,"In [%s::%s %d]\n",__FILE__,__FUNCTION__,__LINE__); + if(stats->getVictory(stats->getThisFactionIndex())==true){ + printf("I won\n"); + if (Config::getInstance().getString("InternetGamesBlockScenario", "") != "" + && Config::getInstance().getBool("InternetGamesAllowed", "false") == false) { + printf("won=%s\n",gameSettings->getScenario().c_str()); + if(Config::getInstance().getString("InternetGamesBlockScenario")==gameSettings->getScenario()){ + Config::getInstance().setBool("InternetGamesAllowed",true); + Config::getInstance().save(); + printf("give it to me baby!\n"); + } + } + } + initBackgroundVideo(); initBackgroundMusic(); diff --git a/source/glest_game/menu/menu_state_new_game.cpp b/source/glest_game/menu/menu_state_new_game.cpp index fa9a9987d..07eb65e31 100644 --- a/source/glest_game/menu/menu_state_new_game.cpp +++ b/source/glest_game/menu/menu_state_new_game.cpp @@ -106,7 +106,17 @@ void MenuStateNewGame::mouseClick(int x, int y, MouseButton mouseButton){ } else if(buttonMasterserverGame.mouseClick(x, y)){ soundRenderer.playFx(coreData.getClickSoundB()); - mainMenu->setState(new MenuStateMasterserver(program, mainMenu)); + if (Config::getInstance().getString("InternetGamesBlockScenario", "") != "" + && Config::getInstance().getBool("InternetGamesAllowed", "false") == false) { + mainMenu->setState( + new MenuStateScenario(program, mainMenu, false, + Config::getInstance().getPathListForType( + ptScenarios), + Config::getInstance().getString( + "InternetGamesBlockScenario"))); + } else { + mainMenu->setState(new MenuStateMasterserver(program, mainMenu)); + } } else if(buttonTutorial.mouseClick(x, y)){ soundRenderer.playFx(coreData.getClickSoundB());