finish ctor transition

This commit is contained in:
Glenn Maynard
2006-01-15 20:46:15 +00:00
parent 65e58afda2
commit a87993bcb1
71 changed files with 72 additions and 79 deletions
-7
View File
@@ -17,13 +17,6 @@ void RegisterScreenClass( const CString& sClassName, CreateScreenFn pfn );
// Each Screen class should have a REGISTER_SCREEN_CLASS in its CPP file.
#define REGISTER_SCREEN_CLASS( className ) \
static Screen* Create##className( const CString &sName ) { Screen *pRet = new className( sName ); Screen::InitScreen( pRet ); return pRet; } \
struct Register##className { \
Register##className() { RegisterScreenClass( #className,Create##className); } \
}; \
static Register##className register_##className;
#define REGISTER_SCREEN_CLASS_NEW( className ) \
static Screen* Create##className( const CString &sName ) { Screen *pRet = new className; pRet->SetName( sName ); Screen::InitScreen( pRet ); return pRet; } \
struct Register##className { \
Register##className() { RegisterScreenClass( #className,Create##className); } \
+1 -1
View File
@@ -20,7 +20,7 @@
ThemeMetric<bool> BACK_GOES_TO_START_SCREEN( "ScreenAttract", "BackGoesToStartScreen" );
REGISTER_SCREEN_CLASS_NEW( ScreenAttract );
REGISTER_SCREEN_CLASS( ScreenAttract );
ScreenAttract::ScreenAttract( bool bResetGameState )
{
if( bResetGameState )
+1 -1
View File
@@ -10,7 +10,7 @@
#include "LocalizedString.h"
REGISTER_SCREEN_CLASS_NEW( ScreenBookkeeping );
REGISTER_SCREEN_CLASS( ScreenBookkeeping );
void ScreenBookkeeping::Init()
{
+1 -1
View File
@@ -13,7 +13,7 @@
static ThemeMetric<bool> ALLOW_RESIZE("ScreenCenterImage","AllowResize");
REGISTER_SCREEN_CLASS_NEW( ScreenCenterImage );
REGISTER_SCREEN_CLASS( ScreenCenterImage );
void ScreenCenterImage::Init()
{
+1 -1
View File
@@ -4,7 +4,7 @@
#include "AnnouncerManager.h"
REGISTER_SCREEN_CLASS_NEW( ScreenCredits );
REGISTER_SCREEN_CLASS( ScreenCredits );
void ScreenCredits::Init()
{
+1 -1
View File
@@ -64,7 +64,7 @@ static bool IsGameplay()
}
REGISTER_SCREEN_CLASS_NEW( ScreenDebugOverlay );
REGISTER_SCREEN_CLASS( ScreenDebugOverlay );
ScreenDebugOverlay::~ScreenDebugOverlay()
{
+1 -1
View File
@@ -15,7 +15,7 @@
#define SECONDS_TO_SHOW THEME->GetMetricF(m_sName,"SecondsToShow")
#define ALLOW_STYLE_TYPES THEME->GetMetric (m_sName,"AllowStyleTypes")
REGISTER_SCREEN_CLASS_NEW( ScreenDemonstration );
REGISTER_SCREEN_CLASS( ScreenDemonstration );
ScreenDemonstration::ScreenDemonstration()
{
m_bDemonstration = true;
+1 -1
View File
@@ -612,7 +612,7 @@ static int g_iLastInsertTapAttackTrack = -1;
static float g_fLastInsertAttackDurationSeconds = -1;
static BackgroundLayer g_CurrentBGChangeLayer = BACKGROUND_LAYER_INVALID;
REGISTER_SCREEN_CLASS_NEW( ScreenEdit );
REGISTER_SCREEN_CLASS( ScreenEdit );
void ScreenEdit::Init()
{
+1 -1
View File
@@ -2,7 +2,7 @@
#include "ScreenEditCourseMods.h"
#include "RageLog.h"
REGISTER_SCREEN_CLASS_NEW( ScreenEditCourseMods );
REGISTER_SCREEN_CLASS( ScreenEditCourseMods );
void ScreenEditCourseMods::Init()
{
+1 -1
View File
@@ -22,7 +22,7 @@
AutoScreenMessage( SM_RefreshSelector )
AutoScreenMessage( SM_BackFromEditDescription )
REGISTER_SCREEN_CLASS_NEW( ScreenEditMenu );
REGISTER_SCREEN_CLASS( ScreenEditMenu );
void ScreenEditMenu::Init()
{
+1 -1
View File
@@ -126,7 +126,7 @@ CString GetStatsLineValue( PlayerNumber pn, EndingStatsLine line )
}
REGISTER_SCREEN_CLASS_NEW( ScreenEnding );
REGISTER_SCREEN_CLASS( ScreenEnding );
ScreenEnding::ScreenEnding() : ScreenAttract( false/*dont reset GAMESTATE*/ )
{
if( PREFSMAN->m_bScreenTestMode )
+1 -1
View File
@@ -81,7 +81,7 @@ static const int NUM_SHOWN_RADAR_CATEGORIES = 5;
AutoScreenMessage( SM_PlayCheer )
AutoScreenMessage( SM_AddBonus )
REGISTER_SCREEN_CLASS_NEW( ScreenEvaluation );
REGISTER_SCREEN_CLASS( ScreenEvaluation );
ScreenEvaluation::ScreenEvaluation()
{
//
@@ -106,7 +106,7 @@ public:
};
REGISTER_SCREEN_CLASS_NEW( ScreenEvaluationMultiplayer );
REGISTER_SCREEN_CLASS( ScreenEvaluationMultiplayer );
ScreenEvaluationMultiplayer::ScreenEvaluationMultiplayer()
{
//
+1 -1
View File
@@ -11,7 +11,7 @@
* is annoying, because sounds might be deleted at any time; they aren't ours to have
* references to. Also, it's better to quit on command instead of waiting several seconds
* for a sound to stop. */
REGISTER_SCREEN_CLASS_NEW( ScreenExit );
REGISTER_SCREEN_CLASS( ScreenExit );
void ScreenExit::Init()
{
+1 -1
View File
@@ -69,7 +69,7 @@ const float TWEEN_TIME = 0.5f;
AutoScreenMessage( SM_NoSongs )
REGISTER_SCREEN_CLASS_NEW( ScreenEz2SelectMusic );
REGISTER_SCREEN_CLASS( ScreenEz2SelectMusic );
void ScreenEz2SelectMusic::Init()
{
+1 -1
View File
@@ -27,7 +27,7 @@
const float TWEEN_TIME = 0.35f;
REGISTER_SCREEN_CLASS_NEW( ScreenEz2SelectPlayer );
REGISTER_SCREEN_CLASS( ScreenEz2SelectPlayer );
void ScreenEz2SelectPlayer::Init()
{
+1 -1
View File
@@ -5,7 +5,7 @@
#include "PrefsManager.h"
#include "StatsManager.h"
REGISTER_SCREEN_CLASS_NEW( ScreenGameplayLesson );
REGISTER_SCREEN_CLASS( ScreenGameplayLesson );
ScreenGameplayLesson::ScreenGameplayLesson()
{
m_iCurrentPageIndex = 0;
+1 -1
View File
@@ -3,7 +3,7 @@
#include "GameState.h"
REGISTER_SCREEN_CLASS_NEW( ScreenGameplayMultiplayer );
REGISTER_SCREEN_CLASS( ScreenGameplayMultiplayer );
void ScreenGameplayMultiplayer::Init()
{
+1 -1
View File
@@ -2,7 +2,7 @@
#include "ScreenGameplayNormal.h"
REGISTER_SCREEN_CLASS_NEW( ScreenGameplayNormal );
REGISTER_SCREEN_CLASS( ScreenGameplayNormal );
void ScreenGameplayNormal::FillPlayerInfo( vector<PlayerInfo> &vPlayerInfoOut )
{
+1 -1
View File
@@ -65,7 +65,7 @@ static bool HaveAllCharAnimations()
return true;
}
REGISTER_SCREEN_CLASS_NEW( ScreenHowToPlay );
REGISTER_SCREEN_CLASS( ScreenHowToPlay );
ScreenHowToPlay::ScreenHowToPlay()
{
m_iW2s = 0;
+1 -1
View File
@@ -2,7 +2,7 @@
#include "ScreenInstructions.h"
REGISTER_SCREEN_CLASS_NEW( ScreenInstructions );
REGISTER_SCREEN_CLASS( ScreenInstructions );
void ScreenInstructions::Init()
{
+1 -1
View File
@@ -24,7 +24,7 @@ static const char *MultiPlayerStatusNames[] = {
XToString( MultiPlayerStatus, NUM_MultiPlayerStatus );
REGISTER_SCREEN_CLASS_NEW( ScreenJoinMultiplayer );
REGISTER_SCREEN_CLASS( ScreenJoinMultiplayer );
ScreenJoinMultiplayer::ScreenJoinMultiplayer()
{
FOREACH_MultiPlayer( p )
+1 -1
View File
@@ -22,7 +22,7 @@
#define SHOW_COURSE_MODIFIERS_PROBABILITY THEME->GetMetricF(m_sName,"ShowCourseModifiersProbability")
REGISTER_SCREEN_CLASS_NEW( ScreenJukebox );
REGISTER_SCREEN_CLASS( ScreenJukebox );
void ScreenJukebox::SetSong()
{
ThemeMetric<bool> ALLOW_ADVANCED_MODIFIERS(m_sName,"AllowAdvancedModifiers");
+1 -1
View File
@@ -23,7 +23,7 @@ static const float g_fSecondsToWaitForInput = 0.05f;
// reserve the 3rd slot for hard-coded keys
static const int NUM_CHANGABLE_SLOTS = NUM_SHOWN_GAME_TO_DEVICE_SLOTS-1;
REGISTER_SCREEN_CLASS_NEW( ScreenMapControllers );
REGISTER_SCREEN_CLASS( ScreenMapControllers );
void ScreenMapControllers::Init()
{
+1 -1
View File
@@ -21,7 +21,7 @@ const CString CREDIT_LINES[] =
const unsigned NUM_CREDIT_LINES = sizeof(CREDIT_LINES) / sizeof(CString);
REGISTER_SCREEN_CLASS_NEW( ScreenMusicScroll );
REGISTER_SCREEN_CLASS( ScreenMusicScroll );
void ScreenMusicScroll::Init()
{
+1 -1
View File
@@ -85,7 +85,7 @@ float GetClosestCharYPos( float fFakeBeat )
}
REGISTER_SCREEN_CLASS_NEW( ScreenNameEntry );
REGISTER_SCREEN_CLASS( ScreenNameEntry );
ScreenNameEntry::ScreenNameEntry()
{
// DEBUGGING STUFF
+1 -1
View File
@@ -131,7 +131,7 @@ float HighScoreWheel::Scroll()
return GetTweenTimeLeft();
}
REGISTER_SCREEN_CLASS_NEW( ScreenNameEntryTraditional );
REGISTER_SCREEN_CLASS( ScreenNameEntryTraditional );
ScreenNameEntryTraditional::ScreenNameEntryTraditional():
CHANGE_COMMAND("stoptweening;decelerate,.12")
{
+1 -1
View File
@@ -19,7 +19,7 @@ const int NUM_SCORE_DIGITS = 9;
AutoScreenMessage( SM_GotEval )
REGISTER_SCREEN_CLASS_NEW( ScreenNetEvaluation );
REGISTER_SCREEN_CLASS( ScreenNetEvaluation );
void ScreenNetEvaluation::Init()
{
+1 -1
View File
@@ -28,7 +28,7 @@ AutoScreenMessage( SM_SMOnlinePack )
AutoScreenMessage( SM_BackFromRoomName )
AutoScreenMessage( SM_BackFromRoomDesc )
REGISTER_SCREEN_CLASS_NEW( ScreenNetRoom );
REGISTER_SCREEN_CLASS( ScreenNetRoom );
void ScreenNetRoom::Init()
{
+1 -1
View File
@@ -32,7 +32,7 @@ AutoScreenMessage( SM_AddToChat )
AutoScreenMessage( SM_UsersUpdate )
AutoScreenMessage( SM_SMOnlinePack )
REGISTER_SCREEN_CLASS_NEW( ScreenNetSelectBase );
REGISTER_SCREEN_CLASS( ScreenNetSelectBase );
void ScreenNetSelectBase::Init()
{
+1 -1
View File
@@ -37,7 +37,7 @@ const CString AllGroups = "[ALL MUSIC]";
#define DIFFBG_WIDTH THEME->GetMetricF(m_sName,"DiffBGWidth")
#define DIFFBG_HEIGHT THEME->GetMetricF(m_sName,"DiffBGHeight")
REGISTER_SCREEN_CLASS_NEW( ScreenNetSelectMusic );
REGISTER_SCREEN_CLASS( ScreenNetSelectMusic );
void ScreenNetSelectMusic::Init()
{
+1 -1
View File
@@ -44,7 +44,7 @@ AutoScreenMessage( SM_ServerNameEnter )
Preference<CString> g_sLastServer( "LastConnectedServer", "" );
REGISTER_SCREEN_CLASS_NEW( ScreenNetworkOptions );
REGISTER_SCREEN_CLASS( ScreenNetworkOptions );
void ScreenNetworkOptions::Init()
{
+1 -1
View File
@@ -40,7 +40,7 @@ static MenuDef g_TempMenu(
"ScreenMiniMenuContext"
);
REGISTER_SCREEN_CLASS_NEW( ScreenOptionsEditCourse );
REGISTER_SCREEN_CLASS( ScreenOptionsEditCourse );
void ScreenOptionsEditCourse::Init()
{
@@ -45,7 +45,7 @@ static void FillSongsAndChoices( const CString &sSongGroup, vector<Song*> &vpSon
}
REGISTER_SCREEN_CLASS_NEW( ScreenOptionsEditCourseEntry );
REGISTER_SCREEN_CLASS( ScreenOptionsEditCourseEntry );
void ScreenOptionsEditCourseEntry::Init()
{
+1 -1
View File
@@ -16,7 +16,7 @@ enum EditProfileRow
ROW_CHARACTER,
};
REGISTER_SCREEN_CLASS_NEW( ScreenOptionsEditProfile );
REGISTER_SCREEN_CLASS( ScreenOptionsEditProfile );
void ScreenOptionsEditProfile::Init()
{
+1 -1
View File
@@ -127,7 +127,7 @@ static bool ValidateEditCourseName( const CString &sAnswer, CString &sErrorOut )
}
REGISTER_SCREEN_CLASS_NEW( ScreenOptionsManageCourses );
REGISTER_SCREEN_CLASS( ScreenOptionsManageCourses );
void ScreenOptionsManageCourses::Init()
{
@@ -64,7 +64,7 @@ static bool ValidateEditStepsDescription( const CString &sAnswer, CString &sErro
}
REGISTER_SCREEN_CLASS_NEW( ScreenOptionsManageEditSteps );
REGISTER_SCREEN_CLASS( ScreenOptionsManageEditSteps );
void ScreenOptionsManageEditSteps::Init()
{
@@ -74,7 +74,7 @@ static bool ValidateLocalProfileName( const CString &sAnswer, CString &sErrorOut
return true;
}
REGISTER_SCREEN_CLASS_NEW( ScreenOptionsManageProfiles );
REGISTER_SCREEN_CLASS( ScreenOptionsManageProfiles );
ScreenOptionsManageProfiles::~ScreenOptionsManageProfiles()
{
+1 -1
View File
@@ -21,7 +21,7 @@
#define LINE(sLineName) THEME->GetMetric (m_sName,ssprintf("Line%s",sLineName.c_str()))
REGISTER_SCREEN_CLASS_NEW( ScreenOptionsMaster );
REGISTER_SCREEN_CLASS( ScreenOptionsMaster );
void ScreenOptionsMaster::Init()
{
+1 -1
View File
@@ -9,7 +9,7 @@
#include "LocalizedString.h"
REGISTER_SCREEN_CLASS_NEW( ScreenOptionsMemoryCard );
REGISTER_SCREEN_CLASS( ScreenOptionsMemoryCard );
void ScreenOptionsMemoryCard::Init()
{
+1 -1
View File
@@ -21,7 +21,7 @@
AutoScreenMessage( SM_BackFromURL )
REGISTER_SCREEN_CLASS_NEW( ScreenPackages );
REGISTER_SCREEN_CLASS( ScreenPackages );
void ScreenPackages::Init()
{
+1 -1
View File
@@ -15,7 +15,7 @@
#include "Foreach.h"
#include "InputEventPlus.h"
REGISTER_SCREEN_CLASS_NEW( ScreenPlayerOptions );
REGISTER_SCREEN_CLASS( ScreenPlayerOptions );
void ScreenPlayerOptions::Init()
{
+1 -1
View File
@@ -45,7 +45,7 @@ void ScreenPrompt::Prompt( ScreenMessage smSendOnPop, const CString &sText, Prom
REGISTER_SCREEN_CLASS_NEW( ScreenPrompt );
REGISTER_SCREEN_CLASS( ScreenPrompt );
void ScreenPrompt::Init()
{
+3 -3
View File
@@ -84,9 +84,9 @@ static void GetAllCoursesToShow( vector<Course*> &vpOut, CourseType ct, bool bSh
static CString STEPS_TYPE_COLOR_NAME( size_t i ) { return ssprintf("StepsTypeColor%d",int(i+1)); }
REGISTER_SCREEN_CLASS_NEW( ScreenRanking );
REGISTER_SCREEN_CLASS_NEW( ScreenRankingScroller );
REGISTER_SCREEN_CLASS_NEW( ScreenRankingLines );
REGISTER_SCREEN_CLASS( ScreenRanking );
REGISTER_SCREEN_CLASS( ScreenRankingScroller );
REGISTER_SCREEN_CLASS( ScreenRankingLines );
ScreenRanking::ScreenRanking():
ScreenAttract( false /*dont reset GAMESTATE*/ )
+1 -1
View File
@@ -44,7 +44,7 @@ public:
* this for the initial load, since we don't want to start up the display
* until we finish loading songs; that way, people can continue to use their
* computer while songs load. */
REGISTER_SCREEN_CLASS_NEW( ScreenReloadSongs );
REGISTER_SCREEN_CLASS( ScreenReloadSongs );
void ScreenReloadSongs::Init()
{
+1 -1
View File
@@ -15,7 +15,7 @@
#include "Profile.h"
#include "LocalizedString.h"
REGISTER_SCREEN_CLASS_NEW(ScreenSMOnlineLogin);
REGISTER_SCREEN_CLASS(ScreenSMOnlineLogin);
AutoScreenMessage( SM_SMOnlinePack )
AutoScreenMessage( SM_PasswordDone )
+1 -1
View File
@@ -13,7 +13,7 @@
#include "RageLog.h"
REGISTER_SCREEN_CLASS_NEW( ScreenSandbox );
REGISTER_SCREEN_CLASS( ScreenSandbox );
void ScreenSandbox::HandleScreenMessage( const ScreenMessage SM )
{
+1 -1
View File
@@ -115,7 +115,7 @@ static void RevertSyncChanges( void* pThrowAway )
GAMESTATE->RevertSyncChanges();
}
REGISTER_SCREEN_CLASS_NEW( ScreenSaveSync );
REGISTER_SCREEN_CLASS( ScreenSaveSync );
void ScreenSaveSync::Init()
{
ScreenPrompt::Init();
+1 -1
View File
@@ -46,7 +46,7 @@ const PlayerNumber CPU_PLAYER[NUM_PLAYERS] = { PLAYER_2, PLAYER_1 };
REGISTER_SCREEN_CLASS_NEW( ScreenSelectCharacter );
REGISTER_SCREEN_CLASS( ScreenSelectCharacter );
void ScreenSelectCharacter::Init()
+1 -1
View File
@@ -26,7 +26,7 @@
#define IGNORED_ELEMENT_COMMAND THEME->GetMetricA(m_sName,"IgnoredElementOnCommand")
REGISTER_SCREEN_CLASS_NEW( ScreenSelectDifficulty );
REGISTER_SCREEN_CLASS( ScreenSelectDifficulty );
void ScreenSelectDifficulty::Init()
{
+1 -1
View File
@@ -22,7 +22,7 @@
#define BANNER_HEIGHT THEME->GetMetricF("ScreenSelectGroup","BannerHeight")
REGISTER_SCREEN_CLASS_NEW( ScreenSelectGroup );
REGISTER_SCREEN_CLASS( ScreenSelectGroup );
static LocalizedString ALL_MUSIC_STRING( "ScreenSelectGroup", "ALL MUSIC" );
void ScreenSelectGroup::Init()
+1 -1
View File
@@ -21,7 +21,7 @@ CString CURSOR_OFFSET_Y_FROM_ICON_NAME( size_t p ) { return ssprintf("CursorP%dO
/* e.g. "OptionOrderLeft=0:1,1:2,2:3,3:4" */
CString OPTION_ORDER_NAME( size_t dir ) { return "OptionOrder"+MenuDirToString((MenuDir)dir); }
REGISTER_SCREEN_CLASS_NEW( ScreenSelectMaster );
REGISTER_SCREEN_CLASS( ScreenSelectMaster );
void ScreenSelectMaster::Init()
{
+1 -1
View File
@@ -31,7 +31,7 @@ ScreenSelectMode (Constructor)
Desc: Sets up the screen display
************************************/
REGISTER_SCREEN_CLASS_NEW( ScreenSelectMode );
REGISTER_SCREEN_CLASS( ScreenSelectMode );
void ScreenSelectMode::Init()
{
+1 -1
View File
@@ -50,7 +50,7 @@ static bool g_bBannerWaiting = false;
static bool g_bSampleMusicWaiting = false;
static RageTimer g_StartedLoadingAt(RageZeroTimer);
REGISTER_SCREEN_CLASS_NEW( ScreenSelectMusic );
REGISTER_SCREEN_CLASS( ScreenSelectMusic );
ScreenSelectMusic::ScreenSelectMusic()
{
if( PREFSMAN->m_bScreenTestMode )
+1 -1
View File
@@ -19,7 +19,7 @@
#define DISABLED_COMMAND THEME->GetMetricA(m_sName,"DisabledCommand")
REGISTER_SCREEN_CLASS_NEW( ScreenSelectStyle );
REGISTER_SCREEN_CLASS( ScreenSelectStyle );
void ScreenSelectStyle::Init()
{
+1 -1
View File
@@ -448,7 +448,7 @@ static CString ResetPreferences()
REGISTER_SCREEN_CLASS_NEW( ScreenServiceAction );
REGISTER_SCREEN_CLASS( ScreenServiceAction );
void ScreenServiceAction::Init()
{
ScreenPrompt::Init();
+1 -1
View File
@@ -37,7 +37,7 @@ static float GetTitleY( SetTimeSelection s ) { return g_Y[s]; }
static float GetValueX( SetTimeSelection s ) { return g_X[s] + 80; }
static float GetValueY( SetTimeSelection s ) { return g_Y[s]; }
REGISTER_SCREEN_CLASS_NEW( ScreenSetTime );
REGISTER_SCREEN_CLASS( ScreenSetTime );
void ScreenSetTime::Init()
{
+1 -1
View File
@@ -5,7 +5,7 @@
#include "ThemeManager.h"
#include "PrefsManager.h"
REGISTER_SCREEN_CLASS_NEW( ScreenSongOptions );
REGISTER_SCREEN_CLASS( ScreenSongOptions );
void ScreenSongOptions::Init()
{
+1 -1
View File
@@ -7,7 +7,7 @@
AutoScreenMessage( SM_PrepScreen )
REGISTER_SCREEN_CLASS_NEW( ScreenSplash );
REGISTER_SCREEN_CLASS( ScreenSplash );
void ScreenSplash::Init()
{
+1 -1
View File
@@ -14,7 +14,7 @@
AutoScreenMessage( SM_PrepScreen )
REGISTER_SCREEN_CLASS_NEW( ScreenStage );
REGISTER_SCREEN_CLASS( ScreenStage );
void ScreenStage::Init()
{
+1 -1
View File
@@ -6,7 +6,7 @@
#include "RageLog.h"
#include "ScreenDimensions.h"
REGISTER_SCREEN_CLASS_NEW( ScreenStatsOverlay );
REGISTER_SCREEN_CLASS( ScreenStatsOverlay );
void ScreenStatsOverlay::Init()
{
+1 -1
View File
@@ -13,7 +13,7 @@ static bool IsGameplay()
return SCREENMAN && SCREENMAN->GetTopScreen() && SCREENMAN->GetTopScreen()->GetScreenType() == gameplay;
}
REGISTER_SCREEN_CLASS_NEW( ScreenSyncOverlay );
REGISTER_SCREEN_CLASS( ScreenSyncOverlay );
void ScreenSyncOverlay::Init()
{
+1 -1
View File
@@ -14,7 +14,7 @@
#include "ScreenDimensions.h"
REGISTER_SCREEN_CLASS_NEW( ScreenSystemLayer );
REGISTER_SCREEN_CLASS( ScreenSystemLayer );
void ScreenSystemLayer::Init()
{
SubscribeToMessage( "RefreshCreditText" );
+1 -1
View File
@@ -25,7 +25,7 @@ void ScreenTest::SetScreen(int num)
current=SCREENMAN->MakeNewScreen("ScreenTestFonts");
}
REGISTER_SCREEN_CLASS_NEW( ScreenTest );
REGISTER_SCREEN_CLASS( ScreenTest );
ScreenTest::ScreenTest()
{
current = NULL;
+1 -1
View File
@@ -30,7 +30,7 @@ void ScreenTestFonts::HandleScreenMessage( const ScreenMessage SM )
SetText( g_sCustomText );
}
REGISTER_SCREEN_CLASS_NEW( ScreenTestFonts );
REGISTER_SCREEN_CLASS( ScreenTestFonts );
void ScreenTestFonts::Init()
{
+1 -1
View File
@@ -14,7 +14,7 @@
#include "LocalizedString.h"
REGISTER_SCREEN_CLASS_NEW( ScreenTestInput );
REGISTER_SCREEN_CLASS( ScreenTestInput );
void ScreenTestInput::Init()
{
+1 -1
View File
@@ -11,7 +11,7 @@
#include "InputEventPlus.h"
#include "LocalizedString.h"
REGISTER_SCREEN_CLASS_NEW( ScreenTestLights );
REGISTER_SCREEN_CLASS( ScreenTestLights );
void ScreenTestLights::Init()
{
+1 -1
View File
@@ -7,7 +7,7 @@
#include "RageUtil.h"
#include "InputEventPlus.h"
REGISTER_SCREEN_CLASS_NEW( ScreenTestSound );
REGISTER_SCREEN_CLASS( ScreenTestSound );
void ScreenTestSound::Init()
{
+1 -1
View File
@@ -71,7 +71,7 @@ bool ScreenTextEntry::s_bCancelledLast = false;
* XXX: Don't allow internal-use codepoints (above 0xFFFF); those are
* subject to change and shouldn't be written to disk.
*/
REGISTER_SCREEN_CLASS_NEW( ScreenTextEntry );
REGISTER_SCREEN_CLASS( ScreenTextEntry );
void ScreenTextEntry::Init()
{
+1 -1
View File
@@ -22,7 +22,7 @@
#define COIN_MODE_CHANGE_SCREEN THEME->GetMetric (m_sName,"CoinModeChangeScreen")
REGISTER_SCREEN_CLASS_NEW( ScreenTitleMenu );
REGISTER_SCREEN_CLASS( ScreenTitleMenu );
ScreenTitleMenu::ScreenTitleMenu()
{
/* XXX We really need two common calls: 1, something run when exiting from gameplay
+1 -1
View File
@@ -24,7 +24,7 @@
#define TIME_TO_DISPLAY THEME->GetMetricF("ScreenUnlock", "TimeToDisplay")
#define POINTS_ZOOM THEME->GetMetricF("ScreenUnlock","PointsZoom")
REGISTER_SCREEN_CLASS_NEW( ScreenUnlock );
REGISTER_SCREEN_CLASS( ScreenUnlock );
void ScreenUnlock::Init()
{