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

- added new commandline option to auto-load a scenario:

Browse Source 
--load-scenario=x
- added support for a special faction preview texture when faction preview is enabled
This commit is contained in:
Mark Vejvoda
2010-09-01 06:05:28 +00:00
parent 21ded6679f
commit ab42ca7ace
9 changed files with 130 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
source/glest_game/main/program.cpp
View File

@@ -26,6 +26,7 @@
#include "network_manager.h"
#include "menu_state_custom_game.h"
#include "menu_state_join_game.h"
#include "menu_state_scenario.h"
#include "leak_dumper.h"
using namespace Shared::Util;
@@ -149,7 +150,7 @@ void Program::initServer(WindowGl *window){
mainMenu->setState(new MenuStateCustomGame(this, mainMenu, true));
}
void Program::initClient(WindowGl *window, const Ip &serverIp){
void Program::initClient(WindowGl *window, const Ip &serverIp) {
MainMenu* mainMenu= NULL;
init(window);
@@ -158,6 +159,15 @@ void Program::initClient(WindowGl *window, const Ip &serverIp){
mainMenu->setState(new MenuStateJoinGame(this, mainMenu, true, serverIp));
}
void Program::initScenario(WindowGl *window, string autoloadScenarioName) {
MainMenu* mainMenu= NULL;
init(window);
mainMenu= new MainMenu(this);
setState(mainMenu);
mainMenu->setState(new MenuStateScenario(this, mainMenu, Config::getInstance().getPathListForType(ptScenarios),autoloadScenarioName));
}
Program::~Program(){
delete programState;
programState = NULL;