Commit 6612fd07 authored by Gerhard Stein's avatar Gerhard Stein Committed by Gerhard Stein

Cleanups for the new settings menu

parent 4c3df51d
......@@ -46,6 +46,9 @@ GameMenu( GsRect<float>(0.25f, 0.24f, 0.5f, 0.40f),
new OpenMenuEvent( new COptions(Style()) ),
style ) );
if(style != GsControl::Style::NONE)
{
#if defined (SINGLEPLAYER)
mpMenuDialog->addControl( new GameButton( "Controls",
......@@ -69,6 +72,8 @@ GameMenu( GsRect<float>(0.25f, 0.24f, 0.5f, 0.40f),
new OpenMenuEvent( new CheatsMenu(style) ),
style ) );
}
setMenuLabel("CONFIGMENULABEL");
}
......@@ -10,15 +10,12 @@ GameButton::GameButton(const std::string& text,
const Style style) :
GsButton(text, ev, style)
{
if(mStyle == Style::NONE)
{
mFontID = 0;
}
else if(mStyle == Style::GALAXY)
if(mStyle == Style::GALAXY)
{
mFontID = 1;
setText(text);
}
else
else if(mStyle == Style::VORTICON)
{
mFontID = 1;
}
......
......@@ -57,7 +57,7 @@ void Switch::drawNoStyle(SDL_Rect& lRect)
// Now lets draw the text of the list control
GsFont &Font = gGraphics.getFont(0);
std::string text = mText + ": " + (*mOLCurrent);
std::string text = mText + ":" + (*mOLCurrent);
Font.drawFont( blitsfc, text, lRect.x+40, lRect.y, false );
......
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