Transition away from Screen(sName).
This commit is contained in:
@@ -15,8 +15,8 @@
|
|||||||
#define SECONDS_TO_SHOW THEME->GetMetricF(m_sName,"SecondsToShow")
|
#define SECONDS_TO_SHOW THEME->GetMetricF(m_sName,"SecondsToShow")
|
||||||
#define ALLOW_STYLE_TYPES THEME->GetMetric (m_sName,"AllowStyleTypes")
|
#define ALLOW_STYLE_TYPES THEME->GetMetric (m_sName,"AllowStyleTypes")
|
||||||
|
|
||||||
REGISTER_SCREEN_CLASS( ScreenDemonstration );
|
REGISTER_SCREEN_CLASS_NEW( ScreenDemonstration );
|
||||||
ScreenDemonstration::ScreenDemonstration( CString sName ) : ScreenJukebox( sName )
|
ScreenDemonstration::ScreenDemonstration()
|
||||||
{
|
{
|
||||||
m_bDemonstration = true;
|
m_bDemonstration = true;
|
||||||
SOUNDMAN->SetPlayOnlyCriticalSounds( !GAMESTATE->IsTimeToPlayAttractSounds() ); // mute attract sounds
|
SOUNDMAN->SetPlayOnlyCriticalSounds( !GAMESTATE->IsTimeToPlayAttractSounds() ); // mute attract sounds
|
||||||
|
|||||||
@@ -9,7 +9,7 @@
|
|||||||
class ScreenDemonstration : public ScreenJukebox
|
class ScreenDemonstration : public ScreenJukebox
|
||||||
{
|
{
|
||||||
public:
|
public:
|
||||||
ScreenDemonstration( CString sName );
|
ScreenDemonstration();
|
||||||
virtual void Init();
|
virtual void Init();
|
||||||
|
|
||||||
virtual void HandleScreenMessage( const ScreenMessage SM );
|
virtual void HandleScreenMessage( const ScreenMessage SM );
|
||||||
|
|||||||
@@ -834,7 +834,8 @@ ScreenMiniMenu *ScreenEdit::LoadEditMiniMenu( const MenuDef* pDef )
|
|||||||
MenuDef menu("");
|
MenuDef menu("");
|
||||||
MakeFilteredMenuDef( pDef, menu );
|
MakeFilteredMenuDef( pDef, menu );
|
||||||
|
|
||||||
ScreenMiniMenu *pScreen = new ScreenMiniMenu( pDef->sClassName );
|
ScreenMiniMenu *pScreen = new ScreenMiniMenu;
|
||||||
|
pScreen->SetName( pDef->sClassName );
|
||||||
Screen::InitScreen( pScreen );
|
Screen::InitScreen( pScreen );
|
||||||
pScreen->LoadMenu( &menu );
|
pScreen->LoadMenu( &menu );
|
||||||
return pScreen;
|
return pScreen;
|
||||||
|
|||||||
@@ -334,7 +334,7 @@ GetNextVisiblePlayerInfo( vector<PlayerInfo>::iterator iter, vector<PlayerInfo>
|
|||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
ScreenGameplay::ScreenGameplay( CString sName ) : ScreenWithMenuElements(sName)
|
ScreenGameplay::ScreenGameplay()
|
||||||
{
|
{
|
||||||
m_pPlayerScoreList = NULL;
|
m_pPlayerScoreList = NULL;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -99,7 +99,7 @@ public:
|
|||||||
class ScreenGameplay : public ScreenWithMenuElements
|
class ScreenGameplay : public ScreenWithMenuElements
|
||||||
{
|
{
|
||||||
public:
|
public:
|
||||||
ScreenGameplay( CString sName );
|
ScreenGameplay();
|
||||||
virtual void Init();
|
virtual void Init();
|
||||||
virtual ~ScreenGameplay();
|
virtual ~ScreenGameplay();
|
||||||
|
|
||||||
|
|||||||
@@ -5,8 +5,8 @@
|
|||||||
#include "PrefsManager.h"
|
#include "PrefsManager.h"
|
||||||
#include "StatsManager.h"
|
#include "StatsManager.h"
|
||||||
|
|
||||||
REGISTER_SCREEN_CLASS( ScreenGameplayLesson );
|
REGISTER_SCREEN_CLASS_NEW( ScreenGameplayLesson );
|
||||||
ScreenGameplayLesson::ScreenGameplayLesson( CString sName ) : ScreenGameplayNormal( sName )
|
ScreenGameplayLesson::ScreenGameplayLesson()
|
||||||
{
|
{
|
||||||
m_iCurrentPageIndex = 0;
|
m_iCurrentPageIndex = 0;
|
||||||
m_Try = Try_1;
|
m_Try = Try_1;
|
||||||
|
|||||||
@@ -9,7 +9,7 @@ class CourseEntry;
|
|||||||
class ScreenGameplayLesson : public ScreenGameplayNormal
|
class ScreenGameplayLesson : public ScreenGameplayNormal
|
||||||
{
|
{
|
||||||
public:
|
public:
|
||||||
ScreenGameplayLesson( CString sName );
|
ScreenGameplayLesson();
|
||||||
virtual void Init();
|
virtual void Init();
|
||||||
|
|
||||||
virtual void Input( const InputEventPlus &input );
|
virtual void Input( const InputEventPlus &input );
|
||||||
|
|||||||
@@ -3,12 +3,7 @@
|
|||||||
#include "GameState.h"
|
#include "GameState.h"
|
||||||
|
|
||||||
|
|
||||||
REGISTER_SCREEN_CLASS( ScreenGameplayMultiplayer );
|
REGISTER_SCREEN_CLASS_NEW( ScreenGameplayMultiplayer );
|
||||||
|
|
||||||
ScreenGameplayMultiplayer::ScreenGameplayMultiplayer( CString sName ) : ScreenGameplay(sName)
|
|
||||||
{
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
void ScreenGameplayMultiplayer::Init()
|
void ScreenGameplayMultiplayer::Init()
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -9,7 +9,6 @@ class LyricsLoader;
|
|||||||
class ScreenGameplayMultiplayer : public ScreenGameplay
|
class ScreenGameplayMultiplayer : public ScreenGameplay
|
||||||
{
|
{
|
||||||
public:
|
public:
|
||||||
ScreenGameplayMultiplayer( CString sName );
|
|
||||||
void Init();
|
void Init();
|
||||||
virtual void FillPlayerInfo( vector<PlayerInfo> &vPlayerInfoOut );
|
virtual void FillPlayerInfo( vector<PlayerInfo> &vPlayerInfoOut );
|
||||||
virtual void ScreenGameplayMultiplayer::LoadNextSong();
|
virtual void ScreenGameplayMultiplayer::LoadNextSong();
|
||||||
|
|||||||
@@ -2,12 +2,7 @@
|
|||||||
#include "ScreenGameplayNormal.h"
|
#include "ScreenGameplayNormal.h"
|
||||||
|
|
||||||
|
|
||||||
REGISTER_SCREEN_CLASS( ScreenGameplayNormal );
|
REGISTER_SCREEN_CLASS_NEW( ScreenGameplayNormal );
|
||||||
|
|
||||||
ScreenGameplayNormal::ScreenGameplayNormal( CString sName ) : ScreenGameplay(sName)
|
|
||||||
{
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
void ScreenGameplayNormal::FillPlayerInfo( vector<PlayerInfo> &vPlayerInfoOut )
|
void ScreenGameplayNormal::FillPlayerInfo( vector<PlayerInfo> &vPlayerInfoOut )
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -9,7 +9,6 @@ class LyricsLoader;
|
|||||||
class ScreenGameplayNormal : public ScreenGameplay
|
class ScreenGameplayNormal : public ScreenGameplay
|
||||||
{
|
{
|
||||||
public:
|
public:
|
||||||
ScreenGameplayNormal( CString sName );
|
|
||||||
virtual void FillPlayerInfo( vector<PlayerInfo> &vPlayerInfoOut );
|
virtual void FillPlayerInfo( vector<PlayerInfo> &vPlayerInfoOut );
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|||||||
@@ -22,7 +22,7 @@
|
|||||||
|
|
||||||
#define SHOW_COURSE_MODIFIERS_PROBABILITY THEME->GetMetricF(m_sName,"ShowCourseModifiersProbability")
|
#define SHOW_COURSE_MODIFIERS_PROBABILITY THEME->GetMetricF(m_sName,"ShowCourseModifiersProbability")
|
||||||
|
|
||||||
REGISTER_SCREEN_CLASS( ScreenJukebox );
|
REGISTER_SCREEN_CLASS_NEW( ScreenJukebox );
|
||||||
void ScreenJukebox::SetSong()
|
void ScreenJukebox::SetSong()
|
||||||
{
|
{
|
||||||
ThemeMetric<bool> ALLOW_ADVANCED_MODIFIERS(m_sName,"AllowAdvancedModifiers");
|
ThemeMetric<bool> ALLOW_ADVANCED_MODIFIERS(m_sName,"AllowAdvancedModifiers");
|
||||||
@@ -167,7 +167,7 @@ void ScreenJukebox::SetSong()
|
|||||||
return; // didn't find a song
|
return; // didn't find a song
|
||||||
}
|
}
|
||||||
|
|
||||||
ScreenJukebox::ScreenJukebox( CString sName ) : ScreenGameplayNormal( sName )
|
ScreenJukebox::ScreenJukebox()
|
||||||
{
|
{
|
||||||
m_bDemonstration = false;
|
m_bDemonstration = false;
|
||||||
|
|
||||||
|
|||||||
@@ -9,7 +9,7 @@ class CourseEntry;
|
|||||||
class ScreenJukebox : public ScreenGameplayNormal
|
class ScreenJukebox : public ScreenGameplayNormal
|
||||||
{
|
{
|
||||||
public:
|
public:
|
||||||
ScreenJukebox( CString sName );
|
ScreenJukebox();
|
||||||
virtual void Init();
|
virtual void Init();
|
||||||
|
|
||||||
virtual void Input( const InputEventPlus &input );
|
virtual void Input( const InputEventPlus &input );
|
||||||
|
|||||||
@@ -17,7 +17,8 @@ vector<int> ScreenMiniMenu::s_viLastAnswers;
|
|||||||
|
|
||||||
void ScreenMiniMenu::MiniMenu( MenuDef* pDef, ScreenMessage SM_SendOnOK, ScreenMessage SM_SendOnCancel, float fX, float fY )
|
void ScreenMiniMenu::MiniMenu( MenuDef* pDef, ScreenMessage SM_SendOnOK, ScreenMessage SM_SendOnCancel, float fX, float fY )
|
||||||
{
|
{
|
||||||
ScreenMiniMenu *pNewScreen = new ScreenMiniMenu( pDef->sClassName );
|
ScreenMiniMenu *pNewScreen = new ScreenMiniMenu;
|
||||||
|
pNewScreen->SetName( pDef->sClassName );
|
||||||
pNewScreen->Init();
|
pNewScreen->Init();
|
||||||
pNewScreen->LoadMenu( pDef );
|
pNewScreen->LoadMenu( pDef );
|
||||||
pNewScreen->SetOKMessage( SM_SendOnOK );
|
pNewScreen->SetOKMessage( SM_SendOnOK );
|
||||||
@@ -28,9 +29,6 @@ void ScreenMiniMenu::MiniMenu( MenuDef* pDef, ScreenMessage SM_SendOnOK, ScreenM
|
|||||||
}
|
}
|
||||||
|
|
||||||
//REGISTER_SCREEN_CLASS( ScreenMiniMenu );
|
//REGISTER_SCREEN_CLASS( ScreenMiniMenu );
|
||||||
ScreenMiniMenu::ScreenMiniMenu( CString sClassName ) :ScreenOptions( sClassName )
|
|
||||||
{
|
|
||||||
}
|
|
||||||
|
|
||||||
void ScreenMiniMenu::LoadMenu( const MenuDef* pDef )
|
void ScreenMiniMenu::LoadMenu( const MenuDef* pDef )
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -88,7 +88,6 @@ class ScreenMiniMenu : public ScreenOptions
|
|||||||
public:
|
public:
|
||||||
static void MiniMenu( MenuDef* pDef, ScreenMessage smSendOnOK, ScreenMessage smSendOnCancel = SM_None, float fX = 0, float fY = 0 );
|
static void MiniMenu( MenuDef* pDef, ScreenMessage smSendOnOK, ScreenMessage smSendOnCancel = SM_None, float fX = 0, float fY = 0 );
|
||||||
|
|
||||||
ScreenMiniMenu( CString sScreenClass );
|
|
||||||
void LoadMenu( const MenuDef* pDef );
|
void LoadMenu( const MenuDef* pDef );
|
||||||
void HandleScreenMessage( const ScreenMessage SM );
|
void HandleScreenMessage( const ScreenMessage SM );
|
||||||
|
|
||||||
|
|||||||
@@ -131,8 +131,8 @@ float HighScoreWheel::Scroll()
|
|||||||
return GetTweenTimeLeft();
|
return GetTweenTimeLeft();
|
||||||
}
|
}
|
||||||
|
|
||||||
REGISTER_SCREEN_CLASS( ScreenNameEntryTraditional );
|
REGISTER_SCREEN_CLASS_NEW( ScreenNameEntryTraditional );
|
||||||
ScreenNameEntryTraditional::ScreenNameEntryTraditional( CString sClassName ) : ScreenWithMenuElements( sClassName ),
|
ScreenNameEntryTraditional::ScreenNameEntryTraditional():
|
||||||
CHANGE_COMMAND("stoptweening;decelerate,.12")
|
CHANGE_COMMAND("stoptweening;decelerate,.12")
|
||||||
{
|
{
|
||||||
if( PREFSMAN->m_bScreenTestMode )
|
if( PREFSMAN->m_bScreenTestMode )
|
||||||
|
|||||||
@@ -43,7 +43,7 @@ public:
|
|||||||
class ScreenNameEntryTraditional : public ScreenWithMenuElements
|
class ScreenNameEntryTraditional : public ScreenWithMenuElements
|
||||||
{
|
{
|
||||||
public:
|
public:
|
||||||
ScreenNameEntryTraditional( CString sName );
|
ScreenNameEntryTraditional();
|
||||||
virtual void Init();
|
virtual void Init();
|
||||||
virtual ~ScreenNameEntryTraditional();
|
virtual ~ScreenNameEntryTraditional();
|
||||||
|
|
||||||
|
|||||||
@@ -44,10 +44,7 @@ AutoScreenMessage( SM_ServerNameEnter )
|
|||||||
|
|
||||||
Preference<CString> g_sLastServer( "LastConnectedServer", "" );
|
Preference<CString> g_sLastServer( "LastConnectedServer", "" );
|
||||||
|
|
||||||
REGISTER_SCREEN_CLASS( ScreenNetworkOptions );
|
REGISTER_SCREEN_CLASS_NEW( ScreenNetworkOptions );
|
||||||
ScreenNetworkOptions::ScreenNetworkOptions( CString sClassName ) : ScreenOptions( sClassName )
|
|
||||||
{
|
|
||||||
}
|
|
||||||
|
|
||||||
void ScreenNetworkOptions::Init()
|
void ScreenNetworkOptions::Init()
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -6,7 +6,6 @@
|
|||||||
class ScreenNetworkOptions : public ScreenOptions
|
class ScreenNetworkOptions : public ScreenOptions
|
||||||
{
|
{
|
||||||
public:
|
public:
|
||||||
ScreenNetworkOptions( CString sName );
|
|
||||||
virtual void Init();
|
virtual void Init();
|
||||||
|
|
||||||
virtual void HandleScreenMessage( const ScreenMessage SM );
|
virtual void HandleScreenMessage( const ScreenMessage SM );
|
||||||
|
|||||||
@@ -73,7 +73,7 @@ static CString OPTION_EXPLANATION( CString s )
|
|||||||
}
|
}
|
||||||
|
|
||||||
//REGISTER_SCREEN_CLASS( ScreenOptions ); // can't be instantiated
|
//REGISTER_SCREEN_CLASS( ScreenOptions ); // can't be instantiated
|
||||||
ScreenOptions::ScreenOptions( CString sClassName ) : ScreenWithMenuElements(sClassName)
|
ScreenOptions::ScreenOptions()
|
||||||
{
|
{
|
||||||
m_fLockInputSecs = 0.0001f; // always lock for a tiny amount of time so that we throw away any queued inputs during the load.
|
m_fLockInputSecs = 0.0001f; // always lock for a tiny amount of time so that we throw away any queued inputs during the load.
|
||||||
|
|
||||||
|
|||||||
@@ -29,7 +29,7 @@ enum InputMode
|
|||||||
class ScreenOptions : public ScreenWithMenuElements
|
class ScreenOptions : public ScreenWithMenuElements
|
||||||
{
|
{
|
||||||
public:
|
public:
|
||||||
ScreenOptions( CString sClassName );
|
ScreenOptions();
|
||||||
virtual void Init();
|
virtual void Init();
|
||||||
virtual void BeginScreen();
|
virtual void BeginScreen();
|
||||||
void InitMenu( const vector<OptionRowDefinition> &vDefs, const vector<OptionRowHandler*> &vHands );
|
void InitMenu( const vector<OptionRowDefinition> &vDefs, const vector<OptionRowHandler*> &vHands );
|
||||||
|
|||||||
@@ -40,10 +40,7 @@ static MenuDef g_TempMenu(
|
|||||||
"ScreenMiniMenuContext"
|
"ScreenMiniMenuContext"
|
||||||
);
|
);
|
||||||
|
|
||||||
REGISTER_SCREEN_CLASS( ScreenOptionsEditCourse );
|
REGISTER_SCREEN_CLASS_NEW( ScreenOptionsEditCourse );
|
||||||
ScreenOptionsEditCourse::ScreenOptionsEditCourse( CString sName ) : ScreenOptionsEditCourseSubMenu( sName )
|
|
||||||
{
|
|
||||||
}
|
|
||||||
|
|
||||||
void ScreenOptionsEditCourse::Init()
|
void ScreenOptionsEditCourse::Init()
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -7,8 +7,6 @@
|
|||||||
class ScreenOptionsEditCourse : public ScreenOptionsEditCourseSubMenu
|
class ScreenOptionsEditCourse : public ScreenOptionsEditCourseSubMenu
|
||||||
{
|
{
|
||||||
public:
|
public:
|
||||||
ScreenOptionsEditCourse( CString sName );
|
|
||||||
|
|
||||||
void Init();
|
void Init();
|
||||||
virtual void BeginScreen();
|
virtual void BeginScreen();
|
||||||
|
|
||||||
|
|||||||
@@ -45,10 +45,7 @@ static void FillSongsAndChoices( const CString &sSongGroup, vector<Song*> &vpSon
|
|||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
REGISTER_SCREEN_CLASS( ScreenOptionsEditCourseEntry );
|
REGISTER_SCREEN_CLASS_NEW( ScreenOptionsEditCourseEntry );
|
||||||
ScreenOptionsEditCourseEntry::ScreenOptionsEditCourseEntry( CString sName ) : ScreenOptionsEditCourseSubMenu( sName )
|
|
||||||
{
|
|
||||||
}
|
|
||||||
|
|
||||||
void ScreenOptionsEditCourseEntry::Init()
|
void ScreenOptionsEditCourseEntry::Init()
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -8,8 +8,6 @@ class Song;
|
|||||||
class ScreenOptionsEditCourseEntry : public ScreenOptionsEditCourseSubMenu
|
class ScreenOptionsEditCourseEntry : public ScreenOptionsEditCourseSubMenu
|
||||||
{
|
{
|
||||||
public:
|
public:
|
||||||
ScreenOptionsEditCourseEntry( CString sName );
|
|
||||||
|
|
||||||
void Init();
|
void Init();
|
||||||
void BeginScreen();
|
void BeginScreen();
|
||||||
|
|
||||||
|
|||||||
@@ -16,12 +16,7 @@ enum EditProfileRow
|
|||||||
ROW_CHARACTER,
|
ROW_CHARACTER,
|
||||||
};
|
};
|
||||||
|
|
||||||
REGISTER_SCREEN_CLASS( ScreenOptionsEditProfile );
|
REGISTER_SCREEN_CLASS_NEW( ScreenOptionsEditProfile );
|
||||||
ScreenOptionsEditProfile::ScreenOptionsEditProfile( CString sName ) :
|
|
||||||
ScreenOptions( sName )
|
|
||||||
{
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
void ScreenOptionsEditProfile::Init()
|
void ScreenOptionsEditProfile::Init()
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -7,7 +7,6 @@
|
|||||||
class ScreenOptionsEditProfile : public ScreenOptions
|
class ScreenOptionsEditProfile : public ScreenOptions
|
||||||
{
|
{
|
||||||
public:
|
public:
|
||||||
ScreenOptionsEditProfile( CString sName );
|
|
||||||
virtual ~ScreenOptionsEditProfile();
|
virtual ~ScreenOptionsEditProfile();
|
||||||
|
|
||||||
virtual void Init();
|
virtual void Init();
|
||||||
|
|||||||
@@ -63,11 +63,6 @@ static void SetNextCombination()
|
|||||||
RefreshTrail();
|
RefreshTrail();
|
||||||
}
|
}
|
||||||
|
|
||||||
ScreenOptionsEditCourseSubMenu::ScreenOptionsEditCourseSubMenu( CString sName ) : ScreenOptions( sName )
|
|
||||||
{
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
void ScreenOptionsEditCourseSubMenu::MenuSelect( const InputEventPlus &input )
|
void ScreenOptionsEditCourseSubMenu::MenuSelect( const InputEventPlus &input )
|
||||||
{
|
{
|
||||||
if( input.type == IET_FIRST_PRESS )
|
if( input.type == IET_FIRST_PRESS )
|
||||||
@@ -132,10 +127,7 @@ static bool ValidateEditCourseName( const CString &sAnswer, CString &sErrorOut )
|
|||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
REGISTER_SCREEN_CLASS( ScreenOptionsManageCourses );
|
REGISTER_SCREEN_CLASS_NEW( ScreenOptionsManageCourses );
|
||||||
ScreenOptionsManageCourses::ScreenOptionsManageCourses( CString sName ) : ScreenOptionsEditCourseSubMenu( sName )
|
|
||||||
{
|
|
||||||
}
|
|
||||||
|
|
||||||
void ScreenOptionsManageCourses::Init()
|
void ScreenOptionsManageCourses::Init()
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -9,8 +9,6 @@ class Course;
|
|||||||
class ScreenOptionsEditCourseSubMenu : public ScreenOptions
|
class ScreenOptionsEditCourseSubMenu : public ScreenOptions
|
||||||
{
|
{
|
||||||
public:
|
public:
|
||||||
ScreenOptionsEditCourseSubMenu( CString sName );
|
|
||||||
|
|
||||||
protected:
|
protected:
|
||||||
virtual void MenuSelect( const InputEventPlus &input );
|
virtual void MenuSelect( const InputEventPlus &input );
|
||||||
};
|
};
|
||||||
@@ -18,8 +16,6 @@ protected:
|
|||||||
class ScreenOptionsManageCourses : public ScreenOptionsEditCourseSubMenu
|
class ScreenOptionsManageCourses : public ScreenOptionsEditCourseSubMenu
|
||||||
{
|
{
|
||||||
public:
|
public:
|
||||||
ScreenOptionsManageCourses( CString sName );
|
|
||||||
|
|
||||||
void Init();
|
void Init();
|
||||||
virtual void BeginScreen();
|
virtual void BeginScreen();
|
||||||
|
|
||||||
|
|||||||
@@ -64,10 +64,7 @@ static bool ValidateEditStepsDescription( const CString &sAnswer, CString &sErro
|
|||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
REGISTER_SCREEN_CLASS( ScreenOptionsManageEditSteps );
|
REGISTER_SCREEN_CLASS_NEW( ScreenOptionsManageEditSteps );
|
||||||
ScreenOptionsManageEditSteps::ScreenOptionsManageEditSteps( CString sName ) : ScreenOptions( sName )
|
|
||||||
{
|
|
||||||
}
|
|
||||||
|
|
||||||
void ScreenOptionsManageEditSteps::Init()
|
void ScreenOptionsManageEditSteps::Init()
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -9,8 +9,6 @@ class Steps;
|
|||||||
class ScreenOptionsManageEditSteps : public ScreenOptions
|
class ScreenOptionsManageEditSteps : public ScreenOptions
|
||||||
{
|
{
|
||||||
public:
|
public:
|
||||||
ScreenOptionsManageEditSteps( CString sName );
|
|
||||||
|
|
||||||
void Init();
|
void Init();
|
||||||
virtual void BeginScreen();
|
virtual void BeginScreen();
|
||||||
|
|
||||||
|
|||||||
@@ -74,10 +74,7 @@ static bool ValidateLocalProfileName( const CString &sAnswer, CString &sErrorOut
|
|||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
REGISTER_SCREEN_CLASS( ScreenOptionsManageProfiles );
|
REGISTER_SCREEN_CLASS_NEW( ScreenOptionsManageProfiles );
|
||||||
ScreenOptionsManageProfiles::ScreenOptionsManageProfiles( CString sName ) : ScreenOptions( sName )
|
|
||||||
{
|
|
||||||
}
|
|
||||||
|
|
||||||
ScreenOptionsManageProfiles::~ScreenOptionsManageProfiles()
|
ScreenOptionsManageProfiles::~ScreenOptionsManageProfiles()
|
||||||
{
|
{
|
||||||
@@ -96,7 +93,8 @@ void ScreenOptionsManageProfiles::Init()
|
|||||||
SetNavigation( NAV_THREE_KEY_MENU );
|
SetNavigation( NAV_THREE_KEY_MENU );
|
||||||
SetInputMode( INPUTMODE_SHARE_CURSOR );
|
SetInputMode( INPUTMODE_SHARE_CURSOR );
|
||||||
|
|
||||||
m_pContextMenu = new ScreenMiniMenu( g_TempMenu.sClassName );
|
m_pContextMenu = new ScreenMiniMenu;
|
||||||
|
m_pContextMenu->SetName( g_TempMenu.sClassName );
|
||||||
m_pContextMenu->Init();
|
m_pContextMenu->Init();
|
||||||
m_pContextMenu->LoadMenu( &g_TempMenu );
|
m_pContextMenu->LoadMenu( &g_TempMenu );
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -9,7 +9,6 @@ class Course;
|
|||||||
class ScreenOptionsManageProfiles : public ScreenOptions
|
class ScreenOptionsManageProfiles : public ScreenOptions
|
||||||
{
|
{
|
||||||
public:
|
public:
|
||||||
ScreenOptionsManageProfiles( CString sName );
|
|
||||||
~ScreenOptionsManageProfiles();
|
~ScreenOptionsManageProfiles();
|
||||||
|
|
||||||
void Init();
|
void Init();
|
||||||
|
|||||||
@@ -21,11 +21,7 @@
|
|||||||
#define LINE(sLineName) THEME->GetMetric (m_sName,ssprintf("Line%s",sLineName.c_str()))
|
#define LINE(sLineName) THEME->GetMetric (m_sName,ssprintf("Line%s",sLineName.c_str()))
|
||||||
|
|
||||||
|
|
||||||
REGISTER_SCREEN_CLASS( ScreenOptionsMaster );
|
REGISTER_SCREEN_CLASS_NEW( ScreenOptionsMaster );
|
||||||
ScreenOptionsMaster::ScreenOptionsMaster( CString sClassName ):
|
|
||||||
ScreenOptions( sClassName )
|
|
||||||
{
|
|
||||||
}
|
|
||||||
|
|
||||||
void ScreenOptionsMaster::Init()
|
void ScreenOptionsMaster::Init()
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -8,7 +8,6 @@ class OptionRowHandler;
|
|||||||
class ScreenOptionsMaster : public ScreenOptions
|
class ScreenOptionsMaster : public ScreenOptions
|
||||||
{
|
{
|
||||||
public:
|
public:
|
||||||
ScreenOptionsMaster( CString sName );
|
|
||||||
virtual void Init();
|
virtual void Init();
|
||||||
virtual ~ScreenOptionsMaster();
|
virtual ~ScreenOptionsMaster();
|
||||||
|
|
||||||
|
|||||||
@@ -9,10 +9,7 @@
|
|||||||
#include "LocalizedString.h"
|
#include "LocalizedString.h"
|
||||||
|
|
||||||
|
|
||||||
REGISTER_SCREEN_CLASS( ScreenOptionsMemoryCard );
|
REGISTER_SCREEN_CLASS_NEW( ScreenOptionsMemoryCard );
|
||||||
ScreenOptionsMemoryCard::ScreenOptionsMemoryCard( CString sClassName ) : ScreenOptions( sClassName )
|
|
||||||
{
|
|
||||||
}
|
|
||||||
|
|
||||||
void ScreenOptionsMemoryCard::Init()
|
void ScreenOptionsMemoryCard::Init()
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -6,7 +6,6 @@
|
|||||||
class ScreenOptionsMemoryCard : public ScreenOptions
|
class ScreenOptionsMemoryCard : public ScreenOptions
|
||||||
{
|
{
|
||||||
public:
|
public:
|
||||||
ScreenOptionsMemoryCard( CString sName );
|
|
||||||
virtual void Init();
|
virtual void Init();
|
||||||
void BeginScreen();
|
void BeginScreen();
|
||||||
|
|
||||||
|
|||||||
@@ -15,11 +15,7 @@
|
|||||||
#include "Foreach.h"
|
#include "Foreach.h"
|
||||||
#include "InputEventPlus.h"
|
#include "InputEventPlus.h"
|
||||||
|
|
||||||
REGISTER_SCREEN_CLASS( ScreenPlayerOptions );
|
REGISTER_SCREEN_CLASS_NEW( ScreenPlayerOptions );
|
||||||
ScreenPlayerOptions::ScreenPlayerOptions( CString sClassName ) :
|
|
||||||
ScreenOptionsMaster( sClassName )
|
|
||||||
{
|
|
||||||
}
|
|
||||||
|
|
||||||
void ScreenPlayerOptions::Init()
|
void ScreenPlayerOptions::Init()
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -9,7 +9,6 @@ struct lua_State;
|
|||||||
class ScreenPlayerOptions : public ScreenOptionsMaster
|
class ScreenPlayerOptions : public ScreenOptionsMaster
|
||||||
{
|
{
|
||||||
public:
|
public:
|
||||||
ScreenPlayerOptions( CString sName );
|
|
||||||
virtual void Init();
|
virtual void Init();
|
||||||
virtual void BeginScreen();
|
virtual void BeginScreen();
|
||||||
|
|
||||||
|
|||||||
@@ -15,7 +15,7 @@
|
|||||||
#include "Profile.h"
|
#include "Profile.h"
|
||||||
#include "LocalizedString.h"
|
#include "LocalizedString.h"
|
||||||
|
|
||||||
REGISTER_SCREEN_CLASS(ScreenSMOnlineLogin);
|
REGISTER_SCREEN_CLASS_NEW(ScreenSMOnlineLogin);
|
||||||
|
|
||||||
AutoScreenMessage( SM_SMOnlinePack )
|
AutoScreenMessage( SM_SMOnlinePack )
|
||||||
AutoScreenMessage( SM_PasswordDone )
|
AutoScreenMessage( SM_PasswordDone )
|
||||||
@@ -24,10 +24,6 @@ OptionRowDefinition g_ProfileLine[1] = {
|
|||||||
OptionRowDefinition("Profile",false)
|
OptionRowDefinition("Profile",false)
|
||||||
};
|
};
|
||||||
|
|
||||||
ScreenSMOnlineLogin::ScreenSMOnlineLogin(CString sClassName) : ScreenOptions(sClassName)
|
|
||||||
{
|
|
||||||
}
|
|
||||||
|
|
||||||
static LocalizedString DEFINE_A_PROFILE( "ScreenSMOnlineLogin", "You must define a Profile." );
|
static LocalizedString DEFINE_A_PROFILE( "ScreenSMOnlineLogin", "You must define a Profile." );
|
||||||
void ScreenSMOnlineLogin::Init()
|
void ScreenSMOnlineLogin::Init()
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -6,7 +6,6 @@
|
|||||||
class ScreenSMOnlineLogin : public ScreenOptions
|
class ScreenSMOnlineLogin : public ScreenOptions
|
||||||
{
|
{
|
||||||
public:
|
public:
|
||||||
ScreenSMOnlineLogin(CString sName);
|
|
||||||
virtual void Init();
|
virtual void Init();
|
||||||
virtual void HandleScreenMessage(const ScreenMessage SM);
|
virtual void HandleScreenMessage(const ScreenMessage SM);
|
||||||
virtual void MenuStart( const InputEventPlus &input );
|
virtual void MenuStart( const InputEventPlus &input );
|
||||||
|
|||||||
@@ -50,8 +50,8 @@ static bool g_bBannerWaiting = false;
|
|||||||
static bool g_bSampleMusicWaiting = false;
|
static bool g_bSampleMusicWaiting = false;
|
||||||
static RageTimer g_StartedLoadingAt(RageZeroTimer);
|
static RageTimer g_StartedLoadingAt(RageZeroTimer);
|
||||||
|
|
||||||
REGISTER_SCREEN_CLASS( ScreenSelectMusic );
|
REGISTER_SCREEN_CLASS_NEW( ScreenSelectMusic );
|
||||||
ScreenSelectMusic::ScreenSelectMusic( CString sClassName ) : ScreenWithMenuElements( sClassName )
|
ScreenSelectMusic::ScreenSelectMusic()
|
||||||
{
|
{
|
||||||
if( PREFSMAN->m_bScreenTestMode )
|
if( PREFSMAN->m_bScreenTestMode )
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -28,7 +28,7 @@
|
|||||||
class ScreenSelectMusic : public ScreenWithMenuElements
|
class ScreenSelectMusic : public ScreenWithMenuElements
|
||||||
{
|
{
|
||||||
public:
|
public:
|
||||||
ScreenSelectMusic( CString sName );
|
ScreenSelectMusic();
|
||||||
virtual ~ScreenSelectMusic();
|
virtual ~ScreenSelectMusic();
|
||||||
virtual void Init();
|
virtual void Init();
|
||||||
virtual void BeginScreen();
|
virtual void BeginScreen();
|
||||||
|
|||||||
@@ -5,12 +5,7 @@
|
|||||||
#include "ThemeManager.h"
|
#include "ThemeManager.h"
|
||||||
#include "PrefsManager.h"
|
#include "PrefsManager.h"
|
||||||
|
|
||||||
REGISTER_SCREEN_CLASS( ScreenSongOptions );
|
REGISTER_SCREEN_CLASS_NEW( ScreenSongOptions );
|
||||||
ScreenSongOptions::ScreenSongOptions( CString sClassName ) :
|
|
||||||
ScreenOptionsMaster( sClassName )
|
|
||||||
{
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
void ScreenSongOptions::Init()
|
void ScreenSongOptions::Init()
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -6,7 +6,6 @@
|
|||||||
class ScreenSongOptions : public ScreenOptionsMaster
|
class ScreenSongOptions : public ScreenOptionsMaster
|
||||||
{
|
{
|
||||||
public:
|
public:
|
||||||
ScreenSongOptions( CString sName );
|
|
||||||
virtual void Init();
|
virtual void Init();
|
||||||
|
|
||||||
private:
|
private:
|
||||||
|
|||||||
@@ -7,10 +7,7 @@
|
|||||||
AutoScreenMessage( SM_PrepScreen )
|
AutoScreenMessage( SM_PrepScreen )
|
||||||
|
|
||||||
|
|
||||||
REGISTER_SCREEN_CLASS( ScreenSplash );
|
REGISTER_SCREEN_CLASS_NEW( ScreenSplash );
|
||||||
ScreenSplash::ScreenSplash( CString sClassName ) : ScreenWithMenuElements( sClassName )
|
|
||||||
{
|
|
||||||
}
|
|
||||||
|
|
||||||
void ScreenSplash::Init()
|
void ScreenSplash::Init()
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -9,7 +9,6 @@
|
|||||||
class ScreenSplash : public ScreenWithMenuElements
|
class ScreenSplash : public ScreenWithMenuElements
|
||||||
{
|
{
|
||||||
public:
|
public:
|
||||||
ScreenSplash( CString sName );
|
|
||||||
virtual void Init();
|
virtual void Init();
|
||||||
|
|
||||||
virtual void HandleScreenMessage( const ScreenMessage SM );
|
virtual void HandleScreenMessage( const ScreenMessage SM );
|
||||||
|
|||||||
@@ -14,8 +14,8 @@
|
|||||||
#include "ScreenDimensions.h"
|
#include "ScreenDimensions.h"
|
||||||
|
|
||||||
|
|
||||||
REGISTER_SCREEN_CLASS( ScreenSystemLayer );
|
REGISTER_SCREEN_CLASS_NEW( ScreenSystemLayer );
|
||||||
ScreenSystemLayer::ScreenSystemLayer( const CString &sName ) : Screen(sName)
|
ScreenSystemLayer::ScreenSystemLayer()
|
||||||
{
|
{
|
||||||
SubscribeToMessage( "RefreshCreditText" );
|
SubscribeToMessage( "RefreshCreditText" );
|
||||||
SubscribeToMessage( "SystemMessage" );
|
SubscribeToMessage( "SystemMessage" );
|
||||||
|
|||||||
@@ -13,7 +13,7 @@
|
|||||||
class ScreenSystemLayer : public Screen
|
class ScreenSystemLayer : public Screen
|
||||||
{
|
{
|
||||||
public:
|
public:
|
||||||
ScreenSystemLayer( const CString &sName );
|
ScreenSystemLayer();
|
||||||
virtual ~ScreenSystemLayer();
|
virtual ~ScreenSystemLayer();
|
||||||
virtual void Init();
|
virtual void Init();
|
||||||
void HandleMessage( const CString &sCommandName );
|
void HandleMessage( const CString &sCommandName );
|
||||||
|
|||||||
Reference in New Issue
Block a user