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

reverted new game menu structure, as it is inconsistent

Browse Source
This commit is contained in:
Titus Tscharntke
2011-10-23 10:55:54 +00:00
parent 21760072a4
commit aebe2aba24
2 changed files with 9 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
source/glest_game/menu/menu_state_new_game.cpp
View File

@@ -40,46 +40,25 @@ MenuStateNewGame::MenuStateNewGame(Program *program, MainMenu *mainMenu):
containerName = "NewGame"; containerName = "NewGame";
Lang &lang= Lang::getInstance(); Lang &lang= Lang::getInstance();
int yPos=550; int yPos=385;
// GraphicLabel labelSinglePlayer;
// GraphicLabel labelMultiPlayer;
labelSinglePlayer.registerGraphicComponent(containerName,"labelSinglePlayer");
labelSinglePlayer.init(425, yPos, 150);
labelSinglePlayer.setText(lang.get("SinglePlayer"));
labelSinglePlayer.setFont(CoreData::getInstance().getMenuFontBig());
labelSinglePlayer.setFont3D(CoreData::getInstance().getMenuFontBig3D());
yPos-=40;
buttonTutorial.registerGraphicComponent(containerName,"buttonTutorial");
buttonTutorial.init(425, yPos, 150);
yPos-=40;
buttonScenario.registerGraphicComponent(containerName,"buttonScenario");
buttonScenario.init(425, yPos, 150);
yPos-=40;
buttonCustomGame.registerGraphicComponent(containerName,"buttonCustomGame"); buttonCustomGame.registerGraphicComponent(containerName,"buttonCustomGame");
buttonCustomGame.init(425, yPos, 150); buttonCustomGame.init(425, yPos, 150);
yPos-=40; yPos-=40;
buttonScenario.registerGraphicComponent(containerName,"buttonScenario");
buttonScenario.init(425, yPos, 150);
yPos-=40;
yPos-=40;
labelMultiPlayer.registerGraphicComponent(containerName,"labelMultiPlayer");
labelMultiPlayer.init(425, yPos, 150);
labelMultiPlayer.setText(lang.get("MultiPlayer"));
labelMultiPlayer.setFont(CoreData::getInstance().getMenuFontBig());
labelMultiPlayer.setFont3D(CoreData::getInstance().getMenuFontBig3D());
yPos-=40;
buttonMasterserverGame.registerGraphicComponent(containerName,"buttonMasterserverGame"); buttonMasterserverGame.registerGraphicComponent(containerName,"buttonMasterserverGame");
buttonMasterserverGame.init(425, yPos, 150); buttonMasterserverGame.init(425, yPos, 150);
yPos-=40; yPos-=40;
buttonJoinGame.registerGraphicComponent(containerName,"buttonJoinGame"); buttonJoinGame.registerGraphicComponent(containerName,"buttonJoinGame");
buttonJoinGame.init(425, yPos, 150); buttonJoinGame.init(425, yPos, 150);
yPos-=40;
buttonTutorial.registerGraphicComponent(containerName,"buttonTutorial");
buttonTutorial.init(425, yPos, 150);
yPos-=40;
buttonReturn.registerGraphicComponent(containerName,"buttonReturn"); buttonReturn.registerGraphicComponent(containerName,"buttonReturn");
buttonReturn.init(425, 80, 150); buttonReturn.init(425, yPos, 150);
buttonCustomGame.setText(lang.get("CustomGame")); buttonCustomGame.setText(lang.get("CustomGame"));
buttonScenario.setText(lang.get("Scenario")); buttonScenario.setText(lang.get("Scenario"));
@@ -143,9 +122,6 @@ void MenuStateNewGame::render(){
renderer.renderButton(&buttonTutorial); renderer.renderButton(&buttonTutorial);
renderer.renderButton(&buttonReturn); renderer.renderButton(&buttonReturn);
renderer.renderLabel(&labelSinglePlayer);
renderer.renderLabel(&labelMultiPlayer);
renderer.renderConsole(&console,false,true); renderer.renderConsole(&console,false,true);
if(program != NULL) program->renderProgramMsgBox(); if(program != NULL) program->renderProgramMsgBox();
} }

3
source/glest_game/menu/menu_state_new_game.h
View File

@@ -30,9 +30,6 @@ private:
GraphicButton buttonTutorial; GraphicButton buttonTutorial;
GraphicButton buttonReturn; GraphicButton buttonReturn;
GraphicLabel labelSinglePlayer;
GraphicLabel labelMultiPlayer;
public: public:
MenuStateNewGame(Program *program, MainMenu *mainMenu); MenuStateNewGame(Program *program, MainMenu *mainMenu);