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

- loads of code cleanup based on verbose output from the latest git version of cppcheck

Browse Source
This commit is contained in:
Mark Vejvoda
2012-10-06 07:06:40 +00:00
parent 2a80dd7c3c
commit 5e42c6dc03
37 changed files with 204 additions and 207 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -205,10 +205,8 @@ void Program::initNormal(WindowGl *window){
}
void Program::initSavedGame(WindowGl *window,bool masterserverMode, string saveGameFile) {
MainMenu* mainMenu= NULL;
init(window);
mainMenu= new MainMenu(this);
MainMenu *mainMenu= new MainMenu(this);
setState(mainMenu);
if(saveGameFile == "") {
@@ -237,38 +235,30 @@ void Program::initSavedGame(WindowGl *window,bool masterserverMode, string saveG
void Program::initServer(WindowGl *window, bool autostart,bool openNetworkSlots,
bool masterserverMode) {
MainMenu* mainMenu= NULL;
//this->masterserverMode = masterserverMode;
init(window);
mainMenu= new MainMenu(this);
MainMenu *mainMenu= new MainMenu(this);
setState(mainMenu);
mainMenu->setState(new MenuStateCustomGame(this, mainMenu, openNetworkSlots, pNewGame, autostart, NULL, masterserverMode));
}
void Program::initServer(WindowGl *window, GameSettings *settings) {
MainMenu* mainMenu= NULL;
init(window);
mainMenu= new MainMenu(this);
MainMenu *mainMenu= new MainMenu(this);
setState(mainMenu);
mainMenu->setState(new MenuStateCustomGame(this, mainMenu, false, pNewGame, true, settings));
}
void Program::initClient(WindowGl *window, const Ip &serverIp, int portNumber) {
MainMenu* mainMenu= NULL;
init(window);
mainMenu= new MainMenu(this);
MainMenu *mainMenu= new MainMenu(this);
setState(mainMenu);
mainMenu->setState(new MenuStateJoinGame(this, mainMenu, true, serverIp,portNumber));
}
void Program::initClientAutoFindHost(WindowGl *window) {
MainMenu* mainMenu= NULL;
init(window);
mainMenu= new MainMenu(this);
MainMenu *mainMenu= new MainMenu(this);
setState(mainMenu);
bool autoFindHost = true;
mainMenu->setState(new MenuStateJoinGame(this, mainMenu, &autoFindHost));
@@ -276,10 +266,8 @@ void Program::initClientAutoFindHost(WindowGl *window) {
}
void Program::initScenario(WindowGl *window, string autoloadScenarioName) {
MainMenu* mainMenu= NULL;
init(window);
mainMenu= new MainMenu(this);
MainMenu *mainMenu= new MainMenu(this);
setState(mainMenu);
mainMenu->setState(new MenuStateScenario(this, mainMenu, false,
Config::getInstance().getPathListForType(ptScenarios),autoloadScenarioName));