Commit b4bc9b3f authored by Gerhard Stein's avatar Gerhard Stein

Small fixes

parent a3b4af57
......@@ -158,7 +158,7 @@ bool CGameLauncher::setupMenu()
0.75f,
0.75f ),
GsRect<float>(0.0f, 0.0f, 0.069f, 0.069f) );
/*
mLauncherDialog.addControl(new GsButton( "|", new OpenSettingsMenuEvent(),
GsControl::Style::NONE,
0.75f,
......@@ -166,7 +166,7 @@ bool CGameLauncher::setupMenu()
1.0f ),
GsRect<float>(0.93f, 0.0f, 0.069f, 0.069f) );
*/
mLauncherDialog.addControl(mpGameSelectionList,
GsRect<float>(0.01f, 0.07f, 0.49f, 0.79f));
......
#include "SelectionMenu.h"
CPlayerSpriteVarSelection::
CPlayerSpriteVarSelection(const GsControl::Style style) :
GameMenu( GsRect<float>(0.25f, 0.2f, 0.5f, 0.5f), style )
{
}
void
CPlayerSpriteVarSelection::
ponder(const float deltaT)
{
// TODO: Code for Player selection here!
}
......@@ -392,11 +392,12 @@ void GalaxyEngine::pumpEvent(const CEvent *evPtr)
gEventManager.add(new GMSwitchToGameLauncher);
}
}
else if( const NewGamePlayersEvent* pNewGame = dynamic_cast<const NewGamePlayersEvent*>(evPtr) )
else if( const NewGamePlayersEvent* pNewGame =
dynamic_cast<const NewGamePlayersEvent*>(evPtr) )
{
gBehaviorEngine.mPlayers = pNewGame->mSelection;
//if(gBehaviorEngine.mPlayers > 1)
if(gBehaviorEngine.mPlayers > 1)
{
// Ensure the Sprite variations are correctly setup
mSpriteVars.clear();
......@@ -405,15 +406,15 @@ void GalaxyEngine::pumpEvent(const CEvent *evPtr)
mSpriteVars.push_back(i);
}
//mSpriteVars.assign(1, pStart->mSprite);
gEventManager.add( new OpenMenuEvent(
new CDifficultySelection(
GsControl::Style::GALAXY)) );
}
/*else
else
{
gEventManager.add( new OpenMenuEvent(new CPlayerSpriteVarSelection) );
}*/
gEventManager.add( new OpenMenuEvent(
new CPlayerSpriteVarSelection(GsControl::Style::GALAXY)) );
}
return;
}
else if( const SelectPlayerSpriteVarEvent* pStart =
......
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