From aebe2aba247fb102e61c428a70a0dd364b2067a4 Mon Sep 17 00:00:00 2001 From: Titus Tscharntke Date: Sun, 23 Oct 2011 10:55:54 +0000 Subject: [PATCH] reverted new game menu structure, as it is inconsistent --- .../glest_game/menu/menu_state_new_game.cpp | 42 ++++--------------- source/glest_game/menu/menu_state_new_game.h | 3 -- 2 files changed, 9 insertions(+), 36 deletions(-) diff --git a/source/glest_game/menu/menu_state_new_game.cpp b/source/glest_game/menu/menu_state_new_game.cpp index 207b53243..8bf49ce7d 100644 --- a/source/glest_game/menu/menu_state_new_game.cpp +++ b/source/glest_game/menu/menu_state_new_game.cpp @@ -40,46 +40,25 @@ MenuStateNewGame::MenuStateNewGame(Program *program, MainMenu *mainMenu): containerName = "NewGame"; Lang &lang= Lang::getInstance(); - int yPos=550; -// GraphicLabel labelSinglePlayer; -// GraphicLabel labelMultiPlayer; + int yPos=385; - - 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.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; + buttonScenario.registerGraphicComponent(containerName,"buttonScenario"); + buttonScenario.init(425, yPos, 150); + yPos-=40; buttonMasterserverGame.registerGraphicComponent(containerName,"buttonMasterserverGame"); buttonMasterserverGame.init(425, yPos, 150); yPos-=40; buttonJoinGame.registerGraphicComponent(containerName,"buttonJoinGame"); buttonJoinGame.init(425, yPos, 150); - + yPos-=40; + buttonTutorial.registerGraphicComponent(containerName,"buttonTutorial"); + buttonTutorial.init(425, yPos, 150); + yPos-=40; buttonReturn.registerGraphicComponent(containerName,"buttonReturn"); - buttonReturn.init(425, 80, 150); + buttonReturn.init(425, yPos, 150); buttonCustomGame.setText(lang.get("CustomGame")); buttonScenario.setText(lang.get("Scenario")); @@ -143,9 +122,6 @@ void MenuStateNewGame::render(){ renderer.renderButton(&buttonTutorial); renderer.renderButton(&buttonReturn); - renderer.renderLabel(&labelSinglePlayer); - renderer.renderLabel(&labelMultiPlayer); - renderer.renderConsole(&console,false,true); if(program != NULL) program->renderProgramMsgBox(); } diff --git a/source/glest_game/menu/menu_state_new_game.h b/source/glest_game/menu/menu_state_new_game.h index 77294c36e..8405e703d 100644 --- a/source/glest_game/menu/menu_state_new_game.h +++ b/source/glest_game/menu/menu_state_new_game.h @@ -30,9 +30,6 @@ private: GraphicButton buttonTutorial; GraphicButton buttonReturn; - GraphicLabel labelSinglePlayer; - GraphicLabel labelMultiPlayer; - public: MenuStateNewGame(Program *program, MainMenu *mainMenu);