Commit f6ebe62e authored by Gerhard Stein's avatar Gerhard Stein

Fixed some menu artifacts

parent b4bc9b3f
......@@ -25,7 +25,7 @@ GameMenu(GsRect<float>(0.075f, 0.24f, 0.85f, 0.4f), style )
#endif
mpStereo = new Switch( "Stereo" );
mpStereo = new Switch( "Stereo", style );
mpMenuDialog->addControl( mpStereo );
......
......@@ -86,19 +86,19 @@ mSelectedPlayer(selectedPlayer)
button = new GameButton( "Buttons", new OpenButtonsControlMenuEvent(mSelectedPlayer), style );
mpMenuDialog->addControl( button );
mpTwoButtonSwitch = new Switch( "Two Button Fire" );
mpTwoButtonSwitch = new Switch( "Two Button Fire", style );
mpTwoButtonSwitch->enable(gInput.getTwoButtonFiring(mSelectedPlayer-1));
mpAnalogSwitch = new Switch( "Analog Movement" );
mpAnalogSwitch = new Switch( "Analog Movement", style );
mpAnalogSwitch->enable(gInput.isAnalog(mSelectedPlayer-1));
mpSuperPogoSwitch = new Switch( "Super Pogo" );
mpSuperPogoSwitch = new Switch( "Super Pogo", style );
mpSuperPogoSwitch->enable(gInput.SuperPogo(mSelectedPlayer-1));
mpImpPogoSwitch = new Switch( "Impossible Pogo" );
mpImpPogoSwitch = new Switch( "Impossible Pogo", style );
mpImpPogoSwitch->enable(gInput.ImpossiblePogo(mSelectedPlayer-1));
mpAutoGunSwitch = new Switch( "Auto Gun" );
mpAutoGunSwitch = new Switch( "Auto Gun", style );
mpAutoGunSwitch->enable(gInput.AutoGun(mSelectedPlayer-1));
mpMenuDialog->addControl( mpTwoButtonSwitch );
......
......@@ -17,7 +17,7 @@ GameMenu( GsRect<float>(0.1f, 0.14f, 0.8f,
{
for( const auto &option : gBehaviorEngine.mOptions )
{
mpOptionList.push_back( new Switch( option.second.menuname ) );
mpOptionList.push_back( new Switch( option.second.menuname, style ) );
mpMenuDialog->addControl( mpOptionList.back() );
}
......
......@@ -6,16 +6,16 @@
CheatsMenu::CheatsMenu(const GsControl::Style style) :
GameMenu(GsRect<float>(0.075f, 0.24f, 0.85f, 0.4f), style )
{
mpJumpSwitch = new Switch( "Fly Mode" );
mpJumpSwitch = new Switch( "Fly Mode", style );
mpMenuDialog->addControl( mpJumpSwitch );
mpGodSwitch = new Switch( "God Mode" );
mpGodSwitch = new Switch( "God Mode", style );
mpMenuDialog->addControl( mpGodSwitch );
mpNoClipSwitch = new Switch( "No Clipping" );
mpNoClipSwitch = new Switch( "No Clipping", style );
mpMenuDialog->addControl( mpNoClipSwitch );
mpItemsSwitch = new Switch( "Free items" );
mpItemsSwitch = new Switch( "Free items", style );
mpMenuDialog->addControl( mpItemsSwitch );
}
......
......@@ -8,7 +8,7 @@ class Switch : public ComboSelection
{
public:
Switch( const std::string& text,
const Style style=Style::NONE );
const Style style );
void enable( const bool sel )
{ ComboSelection::setSelection( sel ? "on" : "off" ); }
......
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