Commit e5cbb487 authored by gerstrong@gmail.com's avatar gerstrong@gmail.com

Quick patches for embedded builds

parent 60120941
......@@ -70,12 +70,23 @@ void MainMenu::createGameMenu( const bool openedGamePlay,
mpMenuDialog->addControl( infoButton );
infoButton->enable(false);
}*/
const std::string endGamePlayTest =
openedGamePlay ? "End Game" : "Quit to Launcher";
#if !defined(EMBEDDED)
mpMenuDialog->addControl(new GameButton( endGamePlayTest, new EventEndGamePlay(), style ) );
#else
if(openedGamePlay)
{
mpMenuDialog->addControl(new GameButton( endGamePlayTest, new EventEndGamePlay(), style ) );
}
#endif
mpMenuDialog->addControl(new GameButton( "Quit", new GMQuit(), style ) );
setMenuLabel("MAINMENULABEL");
......
......@@ -16,7 +16,6 @@
#include "CVideoSettings.h"
#include "DisplaySettings.h"
#include "VpadSettings.h"
//#include "CameraSettings.h"
#include "AudioSettings.h"
#include "Options.h"
#include "ControlSettings.h"
......@@ -30,19 +29,26 @@ GameMenu( GsRect<float>(0.25f, 0.24f, 0.5f, 0.40f),
style )
{
#if !defined(EMBEDDED)
mpMenuDialog->addControl(new GameButton( "Display",
new OpenMenuEvent( new DisplaySettings(Style()) ),
style ) );
#endif
mpMenuDialog->addControl(new GameButton( "Audio",
new OpenMenuEvent( new CAudioSettings(Style()) ),
style ) );
#if !defined(EMBEDDED)
mpMenuDialog->addControl(new GameButton( "Video",
new OpenMenuEvent( new CVideoSettings(Style()) ),
style ) );
#endif
mpMenuDialog->addControl(new GameButton( "Options",
new OpenMenuEvent( new COptions(Style()) ),
......@@ -63,13 +69,6 @@ GameMenu( GsRect<float>(0.25f, 0.24f, 0.5f, 0.40f),
style) ),
style ) );
#endif
/*
#if !defined(EMBEDDED)
mpMenuDialog->addControl( new GameButton( "Camera",
new OpenMenuEvent( new CCameraSettings(style) ),
style ) );
#endif
*/
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment