actions/itgmania212121
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

simplify

Browse Source
This commit is contained in:
Glenn Maynard
2004-06-05 02:00:12 +00:00
parent 89cc0b9391
commit a358c9057f
2 changed files with 2 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/ScreenJukeboxMenu.cpp
+2 -24
View File
@@ -15,7 +15,6 @@
#include "ScreenManager.h" #include "ScreenManager.h"
#include "GameConstantsAndTypes.h" #include "GameConstantsAndTypes.h"
#include "RageUtil.h" #include "RageUtil.h"
#include "PrefsManager.h"
#include "GameManager.h" #include "GameManager.h"
#include "RageLog.h" #include "RageLog.h"
#include "GameState.h" #include "GameState.h"
@@ -27,10 +26,7 @@
// //
// Defines specific to ScreenJukeboxMenu // Defines specific to ScreenJukeboxMenu
// //
#define EXPLANATION_X THEME->GetMetricF("ScreenJukeboxMenu","ExplanationX")
#define EXPLANATION_Y THEME->GetMetricF("ScreenJukeboxMenu","ExplanationY")
#define EXPLANATION_TEXT THEME->GetMetric("ScreenJukeboxMenu","ExplanationText") #define EXPLANATION_TEXT THEME->GetMetric("ScreenJukeboxMenu","ExplanationText")
#define HELP_TEXT THEME->GetMetric("ScreenJukeboxMenu","HelpText")
ScreenJukeboxMenu::ScreenJukeboxMenu( CString sClassName ) : ScreenWithMenuElements( sClassName ) ScreenJukeboxMenu::ScreenJukeboxMenu( CString sClassName ) : ScreenWithMenuElements( sClassName )
@@ -47,10 +43,10 @@ ScreenJukeboxMenu::ScreenJukeboxMenu( CString sClassName ) : ScreenWithMenuEleme
this->AddChild( &m_Selector ); this->AddChild( &m_Selector );
m_textExplanation.SetName( "Explanation" );
m_textExplanation.LoadFromFont( THEME->GetPathToF("Common normal") ); m_textExplanation.LoadFromFont( THEME->GetPathToF("Common normal") );
m_textExplanation.SetXY( EXPLANATION_X, EXPLANATION_Y );
m_textExplanation.SetText( EXPLANATION_TEXT ); m_textExplanation.SetText( EXPLANATION_TEXT );
m_textExplanation.SetZoom( 0.7f ); SET_XY_AND_ON_COMMAND( m_textExplanation );
this->AddChild( &m_textExplanation ); this->AddChild( &m_textExplanation );
this->SortByDrawOrder(); this->SortByDrawOrder();
@@ -64,11 +60,6 @@ ScreenJukeboxMenu::~ScreenJukeboxMenu()
LOG->Trace( "ScreenJukeboxMenu::~ScreenJukeboxMenu()" ); LOG->Trace( "ScreenJukeboxMenu::~ScreenJukeboxMenu()" );
} }
void ScreenJukeboxMenu::DrawPrimitives()
{
Screen::DrawPrimitives();
}
void ScreenJukeboxMenu::Input( const DeviceInput& DeviceI, const InputEventType type, const GameInput &GameI, const MenuInput &MenuI, const StyleInput &StyleI ) void ScreenJukeboxMenu::Input( const DeviceInput& DeviceI, const InputEventType type, const GameInput &GameI, const MenuInput &MenuI, const StyleInput &StyleI )
{ {
LOG->Trace( "ScreenJukeboxMenu::Input()" ); LOG->Trace( "ScreenJukeboxMenu::Input()" );
@@ -79,19 +70,6 @@ void ScreenJukeboxMenu::Input( const DeviceInput& DeviceI, const InputEventType
Screen::Input( DeviceI, type, GameI, MenuI, StyleI ); Screen::Input( DeviceI, type, GameI, MenuI, StyleI );
} }
void ScreenJukeboxMenu::HandleScreenMessage( const ScreenMessage SM )
{
switch( SM )
{
case SM_GoToPrevScreen:
SCREENMAN->SetNewScreen( "ScreenTitleMenu" );
break;
case SM_GoToNextScreen:
SCREENMAN->SetNewScreen( "ScreenJukebox" );
break;
}
}
void ScreenJukeboxMenu::MenuUp( PlayerNumber pn ) void ScreenJukeboxMenu::MenuUp( PlayerNumber pn )
{ {
m_Selector.Up(); m_Selector.Up();
stepmania/src/ScreenJukeboxMenu.h
-2
View File
@@ -20,9 +20,7 @@ public:
ScreenJukeboxMenu( CString sName ); ScreenJukeboxMenu( CString sName );
virtual ~ScreenJukeboxMenu(); virtual ~ScreenJukeboxMenu();
virtual void DrawPrimitives();
virtual void Input( const DeviceInput& DeviceI, const InputEventType type, const GameInput &GameI, const MenuInput &MenuI, const StyleInput &StyleI ); virtual void Input( const DeviceInput& DeviceI, const InputEventType type, const GameInput &GameI, const MenuInput &MenuI, const StyleInput &StyleI );
virtual void HandleScreenMessage( const ScreenMessage SM );
private: private: