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

Modify AutoScreenMessage to keep map of all non-standard ScreenMessages.

Browse Source 
This has a lot of advantages over the old ways.  Some of the initial ones are that
you can log a list of all screenmessages and their respective number and another
is that it would be fairly easy to add a reverse lookup, so you could get the name
of a ScreenMessage for log use by getting the ScreenMessage number.
This commit is contained in:
Charles Lohr
2005-03-28 08:01:36 +00:00
parent b2b3a80625
commit 8c5909ebe9
39 changed files with 139 additions and 109 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/EditCoursesMenu.cpp
+1 -1
View File
@@ -34,7 +34,7 @@
#define ROW_VALUE_X( i ) THEME->GetMetricF("EditCoursesMenu",ssprintf("RowValue%dX",i+1)) #define ROW_VALUE_X( i ) THEME->GetMetricF("EditCoursesMenu",ssprintf("RowValue%dX",i+1))
#define ROW_Y( i ) THEME->GetMetricF("EditCoursesMenu",ssprintf("Row%dY",i+1)) #define ROW_Y( i ) THEME->GetMetricF("EditCoursesMenu",ssprintf("Row%dY",i+1))
const AutoScreenMessage SM_BackFromCourseOptionsMenu; AutoScreenMessage( SM_BackFromCourseOptionsMenu )
enum CourseEntryMenuRow enum CourseEntryMenuRow
{ {
stepmania/src/MusicWheel.cpp
+3 -3
View File
@@ -34,9 +34,9 @@ ThemeMetric<CString> DEFAULT_SORT ("ScreenSelectMusic","DefaultSort");
static CString SECTION_COLORS_NAME( size_t i ) { return ssprintf("SectionColor%d",int(i+1)); } static CString SECTION_COLORS_NAME( size_t i ) { return ssprintf("SectionColor%d",int(i+1)); }
static CString CHOICE_NAME( CString s ) { return ssprintf("Choice%s",s.c_str()); } static CString CHOICE_NAME( CString s ) { return ssprintf("Choice%s",s.c_str()); }
const AutoScreenMessage SM_SongChanged; // TODO: Replace this with a Message and MESSAGEMAN AutoScreenMessage( SM_SongChanged ) // TODO: Replace this with a Message and MESSAGEMAN
const AutoScreenMessage SM_SortOrderChanging; AutoScreenMessage( SM_SortOrderChanging );
const AutoScreenMessage SM_SortOrderChanged; AutoScreenMessage( SM_SortOrderChanged );
const int MAX_WHEEL_SOUND_SPEED = 15; const int MAX_WHEEL_SOUND_SPEED = 15;
stepmania/src/MusicWheel.h
-4
View File
@@ -18,10 +18,6 @@
class Course; class Course;
class Song; class Song;
extern const AutoScreenMessage SM_SongChanged; // TODO: Replace this with a Message and MESSAGEMAN
extern const AutoScreenMessage SM_SortOrderChanging;
extern const AutoScreenMessage SM_SortOrderChanged;
struct CompareSongPointerArrayBySectionName; struct CompareSongPointerArrayBySectionName;
class MusicWheel : public ActorFrame class MusicWheel : public ActorFrame
stepmania/src/NetworkSyncManager.cpp
+5 -5
View File
@@ -42,11 +42,11 @@ void NetworkSyncManager::SelectUserSong() { }
#include "arch/LoadingWindow/LoadingWindow.h" #include "arch/LoadingWindow/LoadingWindow.h"
#include "PlayerState.h" #include "PlayerState.h"
const AutoScreenMessage SM_AddToChat; AutoScreenMessage( SM_AddToChat )
const AutoScreenMessage SM_ChangeSong; AutoScreenMessage( SM_ChangeSong );
const AutoScreenMessage SM_GotEval; AutoScreenMessage( SM_GotEval );
const AutoScreenMessage SM_UsersUpdate; AutoScreenMessage( SM_UsersUpdate );
const AutoScreenMessage SM_SMOnlinePack; AutoScreenMessage( SM_SMOnlinePack );
NetworkSyncManager::NetworkSyncManager( LoadingWindow *ld ) NetworkSyncManager::NetworkSyncManager( LoadingWindow *ld )
stepmania/src/ScreenDemonstration.cpp
-1
View File
@@ -14,7 +14,6 @@
#define SECONDS_TO_SHOW THEME->GetMetricF("ScreenDemonstration","SecondsToShow") #define SECONDS_TO_SHOW THEME->GetMetricF("ScreenDemonstration","SecondsToShow")
#define NEXT_SCREEN THEME->GetMetric("ScreenDemonstration","NextScreen") #define NEXT_SCREEN THEME->GetMetric("ScreenDemonstration","NextScreen")
REGISTER_SCREEN_CLASS( ScreenDemonstration ); REGISTER_SCREEN_CLASS( ScreenDemonstration );
ScreenDemonstration::ScreenDemonstration( CString sName ) : ScreenJukebox( sName ) ScreenDemonstration::ScreenDemonstration( CString sName ) : ScreenJukebox( sName )
{ {
stepmania/src/ScreenEdit.cpp
+16 -16
View File
@@ -48,22 +48,22 @@ const float RECORD_HOLD_SECONDS = 0.3f;
#define PLAY_RECORD_HELP_TEXT THEME->GetMetric(m_sName,"PlayRecordHelpText") #define PLAY_RECORD_HELP_TEXT THEME->GetMetric(m_sName,"PlayRecordHelpText")
const AutoScreenMessage SM_BackFromMainMenu; AutoScreenMessage( SM_BackFromMainMenu )
const AutoScreenMessage SM_BackFromAreaMenu; AutoScreenMessage( SM_BackFromAreaMenu )
const AutoScreenMessage SM_BackFromStepsInformation; AutoScreenMessage( SM_BackFromStepsInformation )
const AutoScreenMessage SM_BackFromEditOptions; AutoScreenMessage( SM_BackFromEditOptions )
const AutoScreenMessage SM_BackFromSongInformation; AutoScreenMessage( SM_BackFromSongInformation )
const AutoScreenMessage SM_BackFromBGChange; AutoScreenMessage( SM_BackFromBGChange )
const AutoScreenMessage SM_BackFromInsertAttack; AutoScreenMessage( SM_BackFromInsertAttack )
const AutoScreenMessage SM_BackFromInsertAttackModifiers; AutoScreenMessage( SM_BackFromInsertAttackModifiers )
const AutoScreenMessage SM_BackFromPrefs; AutoScreenMessage( SM_BackFromPrefs )
const AutoScreenMessage SM_BackFromCourseModeMenu; AutoScreenMessage( SM_BackFromCourseModeMenu )
const AutoScreenMessage SM_DoRevertToLastSave; AutoScreenMessage( SM_DoRevertToLastSave )
const AutoScreenMessage SM_DoUpdateTextInfo; AutoScreenMessage( SM_DoUpdateTextInfo )
const AutoScreenMessage SM_BackFromBPMChange; AutoScreenMessage( SM_BackFromBPMChange )
const AutoScreenMessage SM_BackFromStopChange; AutoScreenMessage( SM_BackFromStopChange )
const AutoScreenMessage SM_DoSaveAndExit; AutoScreenMessage( SM_DoSaveAndExit )
const AutoScreenMessage SM_DoExit; AutoScreenMessage( SM_DoExit )
const CString INPUT_TIPS_TEXT = const CString INPUT_TIPS_TEXT =
#if defined(XBOX) #if defined(XBOX)
stepmania/src/ScreenEditCoursesMenu.cpp
+1 -1
View File
@@ -16,7 +16,7 @@
#define EXPLANATION_TEXT THEME->GetMetric (m_sName,"ExplanationText") #define EXPLANATION_TEXT THEME->GetMetric (m_sName,"ExplanationText")
#define HELP_TEXT THEME->GetMetric (m_sName,"HelpText") #define HELP_TEXT THEME->GetMetric (m_sName,"HelpText")
const AutoScreenMessage SM_RefreshSelector; AutoScreenMessage( SM_RefreshSelector )
REGISTER_SCREEN_CLASS( ScreenEditCoursesMenu ); REGISTER_SCREEN_CLASS( ScreenEditCoursesMenu );
ScreenEditCoursesMenu::ScreenEditCoursesMenu( CString sName ) : ScreenWithMenuElements( sName ) ScreenEditCoursesMenu::ScreenEditCoursesMenu( CString sName ) : ScreenWithMenuElements( sName )
stepmania/src/ScreenEditMenu.cpp
+2 -2
View File
@@ -18,8 +18,8 @@
#define PREV_SCREEN THEME->GetMetric(m_sName,"PrevScreen") #define PREV_SCREEN THEME->GetMetric(m_sName,"PrevScreen")
#define EXPLANATION_TEXT( row ) THEME->GetMetric(m_sName,"Explanation"+EditMenuRowToString(row)) #define EXPLANATION_TEXT( row ) THEME->GetMetric(m_sName,"Explanation"+EditMenuRowToString(row))
const AutoScreenMessage SM_RefreshSelector; AutoScreenMessage( SM_RefreshSelector )
const AutoScreenMessage SM_BackFromEditDescription; AutoScreenMessage( SM_BackFromEditDescription )
REGISTER_SCREEN_CLASS( ScreenEditMenu ); REGISTER_SCREEN_CLASS( ScreenEditMenu );
ScreenEditMenu::ScreenEditMenu( CString sName ) : ScreenWithMenuElements( sName ) ScreenEditMenu::ScreenEditMenu( CString sName ) : ScreenWithMenuElements( sName )
stepmania/src/ScreenEndlessBreak.h
+2 -2
View File
@@ -13,8 +13,8 @@
#include "Transition.h" #include "Transition.h"
// Sent to ScreenGameplay so it can keep all it's data ready for when we resume play. // Sent to ScreenGameplay so it can keep all it's data ready for when we resume play.
const AutoScreenMessage SM_BreakInitiated; AutoScreenMessage( SM_BreakInitiated )
const AutoScreenMessage SM_BreakCompleted; AutoScreenMessage( SM_BreakCompleted )
class ScreenEndlessBreak : public Screen class ScreenEndlessBreak : public Screen
{ {
stepmania/src/ScreenEvaluation.cpp
+2 -2
View File
@@ -83,8 +83,8 @@ const char* STATS_STRING[NUM_STATS_LINES] =
static const int NUM_SHOWN_RADAR_CATEGORIES = 5; static const int NUM_SHOWN_RADAR_CATEGORIES = 5;
const AutoScreenMessage SM_PlayCheer; AutoScreenMessage( SM_PlayCheer )
const AutoScreenMessage SM_AddBonus; AutoScreenMessage( SM_AddBonus )
REGISTER_SCREEN_CLASS( ScreenEvaluation ); REGISTER_SCREEN_CLASS( ScreenEvaluation );
stepmania/src/ScreenEz2SelectMusic.cpp
+1 -1
View File
@@ -64,7 +64,7 @@
const float TWEEN_TIME = 0.5f; const float TWEEN_TIME = 0.5f;
const AutoScreenMessage SM_NoSongs; AutoScreenMessage( SM_NoSongs )
REGISTER_SCREEN_CLASS( ScreenEz2SelectMusic ); REGISTER_SCREEN_CLASS( ScreenEz2SelectMusic );
ScreenEz2SelectMusic::ScreenEz2SelectMusic( CString sName ) : ScreenWithMenuElements( sName ) ScreenEz2SelectMusic::ScreenEz2SelectMusic( CString sName ) : ScreenWithMenuElements( sName )
stepmania/src/ScreenGameplay.cpp
+9 -10
View File
@@ -65,24 +65,23 @@ static ThemeMetric<float> SECONDS_BETWEEN_COMMENTS ("ScreenGameplay","SecondsBet
/* Global, so it's accessible from ShowSavePrompt: */ /* Global, so it's accessible from ShowSavePrompt: */
static float g_fOldOffset; // used on offset screen to calculate difference static float g_fOldOffset; // used on offset screen to calculate difference
const AutoScreenMessage SM_PlayReady; AutoScreenMessage( SM_PlayReady )
const AutoScreenMessage SM_PlayGo; AutoScreenMessage( SM_PlayGo )
// received while STATE_DANCING // received while STATE_DANCING
const AutoScreenMessage SM_NotesEnded; AutoScreenMessage( SM_LoadNextSong )
const AutoScreenMessage SM_LoadNextSong; AutoScreenMessage( SM_StartLoadingNextSong )
const AutoScreenMessage SM_StartLoadingNextSong;
// received while STATE_OUTRO // received while STATE_OUTRO
const AutoScreenMessage SM_SaveChangedBeforeGoingBack; AutoScreenMessage( SM_SaveChangedBeforeGoingBack )
const AutoScreenMessage SM_GoToScreenAfterBack; AutoScreenMessage( SM_GoToScreenAfterBack )
const AutoScreenMessage SM_BeginFailed; AutoScreenMessage( SM_BeginFailed )
// received while STATE_INTRO // received while STATE_INTRO
const AutoScreenMessage SM_StartHereWeGo; AutoScreenMessage( SM_StartHereWeGo )
const AutoScreenMessage SM_StopHereWeGo; AutoScreenMessage( SM_StopHereWeGo )
static Preference<float> g_fNetStartOffset( Options, "NetworkStartOffset", -3.0 ); static Preference<float> g_fNetStartOffset( Options, "NetworkStartOffset", -3.0 );
stepmania/src/ScreenGameplay.h
+1 -1
View File
@@ -27,7 +27,7 @@ class Inventory;
#include "AutoKeysounds.h" #include "AutoKeysounds.h"
#include "ThemeMetric.h" #include "ThemeMetric.h"
extern const AutoScreenMessage SM_NotesEnded; AutoScreenMessage( SM_NotesEnded )
class LyricsLoader; class LyricsLoader;
class ScreenGameplay : public Screen class ScreenGameplay : public Screen
stepmania/src/ScreenGameplayMultiplayer.cpp
+4 -6
View File
@@ -29,12 +29,10 @@
// received while STATE_DANCING // received while STATE_DANCING
const AutoScreenMessage SM_NotesEnded; AutoScreenMessage( SM_NotesEnded )
AutoScreenMessage( SM_Ready )
const AutoScreenMessage SM_Ready; AutoScreenMessage( SM_GoToStateAfterCleared )
AutoScreenMessage( SM_GoToScreenAfterBack )
const AutoScreenMessage SM_GoToStateAfterCleared;
const AutoScreenMessage SM_GoToScreenAfterBack;
REGISTER_SCREEN_CLASS( ScreenGameplayMultiplayer ); REGISTER_SCREEN_CLASS( ScreenGameplayMultiplayer );
stepmania/src/ScreenMessage.cpp
+31 -5
View File
@@ -1,15 +1,41 @@
#include "global.h" #include "global.h"
#include "ScreenMessage.h" #include "ScreenMessage.h"
#include "RageLog.h"
AutoScreenMessage::AutoScreenMessage() ASMHClass AutoScreenMessageHandler;
ScreenMessage ASMHClass::ToMessageNumber( const CString &Name )
{ {
static int s_NextID = 100; // a value larger than all the values in the ScreenMessageEnum //If uninitilized, initilize the map. We KNOW it will be NULL
m_sm = (ScreenMessage)s_NextID; if ( m_pScreenMessages == NULL )
s_NextID++; {
m_pScreenMessages = new map < CString, ScreenMessage >;
m_iCurScreenMessage = SM_User;
}
//If the ScreenMessage doesn't exist yet, create it
if ( m_pScreenMessages->find( Name ) == m_pScreenMessages->end() )
{
m_iCurScreenMessage = ScreenMessage((int)m_iCurScreenMessage + 1);
(*m_pScreenMessages)[ Name ] = m_iCurScreenMessage;
}
return (*m_pScreenMessages)[Name];
}
void ASMHClass::LogMessageNumbers( )
{
map < CString, ScreenMessage >::iterator iter;
//Log all ScreenMessages currently in the map
LOG->Trace( "Current ScreenMessage: %d -- SM_User: %d", m_iCurScreenMessage, SM_User );
for ( iter = m_pScreenMessages->begin(); iter != m_pScreenMessages->end(); iter++ )
LOG->Trace( "ScreenMessage: %3d: %s", iter->second, (*iter).first.c_str() );
} }
/* /*
* (c) 2001-2004 Chris Danford, Glenn Maynard * (c) 2001-2005 Chris Danford, Glenn Maynard, Charles Lohr
* All rights reserved. * All rights reserved.
* *
* Permission is hereby granted, free of charge, to any person obtaining a * Permission is hereby granted, free of charge, to any person obtaining a
stepmania/src/ScreenMessage.h
+19 -7
View File
@@ -3,6 +3,8 @@
#ifndef SCREENMESSAGE_H #ifndef SCREENMESSAGE_H
#define SCREENMESSAGE_H #define SCREENMESSAGE_H
#include <map>
enum ScreenMessage { enum ScreenMessage {
SM_None = 0, SM_None = 0,
SM_DoneClosingWipingLeft, SM_DoneClosingWipingLeft,
@@ -42,22 +44,32 @@ enum ScreenMessage {
SM_BattleDamageLevel1, SM_BattleDamageLevel1,
SM_BattleDamageLevel2, SM_BattleDamageLevel2,
SM_BattleDamageLevel3, SM_BattleDamageLevel3,
SM_User
}; };
// Automatically generate a unique ScreenMessage value //AutoScreenMessageHandler Class
class AutoScreenMessage class ASMHClass
{ {
public: public:
AutoScreenMessage(); ScreenMessage ToMessageNumber( const CString & Name );
operator ScreenMessage() const { return m_sm; } void LogMessageNumbers();
protected: private:
ScreenMessage m_sm; map < CString, ScreenMessage > *m_pScreenMessages;
ScreenMessage m_iCurScreenMessage;
}; };
extern ASMHClass AutoScreenMessageHandler;
// Automatically generate a unique ScreenMessage value
#define AutoScreenMessage( x ) \
const ScreenMessage x = AutoScreenMessageHandler.ToMessageNumber( #x );
#endif #endif
/* /*
* (c) 2003-2004 Chris Danford * (c) 2003-2005 Chris Danford, Charles Lohr
* All rights reserved. * All rights reserved.
* *
* Permission is hereby granted, free of charge, to any person obtaining a * Permission is hereby granted, free of charge, to any person obtaining a
stepmania/src/ScreenMiniMenu.cpp
+2 -2
View File
@@ -12,8 +12,8 @@
#include "GameState.h" #include "GameState.h"
#include "FontCharAliases.h" #include "FontCharAliases.h"
const AutoScreenMessage SM_GoToOK; AutoScreenMessage( SM_GoToOK )
const AutoScreenMessage SM_GoToCancel; AutoScreenMessage( SM_GoToCancel )
int ScreenMiniMenu::s_iLastRowCode = -1; int ScreenMiniMenu::s_iLastRowCode = -1;
vector<int> ScreenMiniMenu::s_viLastAnswers; vector<int> ScreenMiniMenu::s_viLastAnswers;
stepmania/src/ScreenNameEntryTraditional.cpp
+1 -1
View File
@@ -36,7 +36,7 @@ static const ThemeMetric<apActorCommands> OK_INIT_COMMMAND ("ScreenNameEntryTra
if( !actor.GetName().empty() ) \ if( !actor.GetName().empty() ) \
COMMAND( actor, command_name ); COMMAND( actor, command_name );
const AutoScreenMessage SM_ChangeDisplayedFeat; AutoScreenMessage( SM_ChangeDisplayedFeat )
static const int CHAR_OK = -1; static const int CHAR_OK = -1;
static const int CHAR_BACK = -2; static const int CHAR_BACK = -2;
stepmania/src/ScreenNetEvaluation.cpp
+1 -1
View File
@@ -17,7 +17,7 @@ const int NUM_SCORE_DIGITS = 9;
#define MAX_COMBO_NUM_DIGITS THEME->GetMetricI("ScreenEvaluation","MaxComboNumDigits") #define MAX_COMBO_NUM_DIGITS THEME->GetMetricI("ScreenEvaluation","MaxComboNumDigits")
const AutoScreenMessage SM_GotEval; AutoScreenMessage( SM_GotEval )
REGISTER_SCREEN_CLASS( ScreenNetEvaluation ); REGISTER_SCREEN_CLASS( ScreenNetEvaluation );
ScreenNetEvaluation::ScreenNetEvaluation (const CString & sClassName) : ScreenEvaluation( sClassName ) ScreenNetEvaluation::ScreenNetEvaluation (const CString & sClassName) : ScreenEvaluation( sClassName )
stepmania/src/ScreenNetRoom.cpp
+3 -3
View File
@@ -21,9 +21,9 @@
#define ROOMLOWERBOUND THEME->GetMetricF(m_sName,"RoomsLowerBound") #define ROOMLOWERBOUND THEME->GetMetricF(m_sName,"RoomsLowerBound")
#define ROOMUPPERBOUND THEME->GetMetricF(m_sName,"RoomsUpperBound") #define ROOMUPPERBOUND THEME->GetMetricF(m_sName,"RoomsUpperBound")
const AutoScreenMessage SM_SMOnlinePack; // Unused, but should be known AutoScreenMessage( SM_SMOnlinePack )
const AutoScreenMessage SM_BackFromRoomName; AutoScreenMessage( SM_BackFromRoomName )
const AutoScreenMessage SM_BackFromRoomDesc; AutoScreenMessage( SM_BackFromRoomDesc )
REGISTER_SCREEN_CLASS( ScreenNetRoom ); REGISTER_SCREEN_CLASS( ScreenNetRoom );
ScreenNetRoom::ScreenNetRoom( const CString& sName ) : ScreenNetSelectBase( sName ) ScreenNetRoom::ScreenNetRoom( const CString& sName ) : ScreenNetSelectBase( sName )
stepmania/src/ScreenNetSelectBase.cpp
+3 -3
View File
@@ -25,9 +25,9 @@
#define USERS_Y THEME->GetMetricF(m_sName,"UsersY") #define USERS_Y THEME->GetMetricF(m_sName,"UsersY")
#define USERS_X THEME->GetMetricF(m_sName,"UsersX") #define USERS_X THEME->GetMetricF(m_sName,"UsersX")
const AutoScreenMessage SM_AddToChat; AutoScreenMessage( SM_AddToChat )
const AutoScreenMessage SM_UsersUpdate; AutoScreenMessage( SM_UsersUpdate )
const AutoScreenMessage SM_SMOnlinePack; //Unused, but should be known AutoScreenMessage( SM_SMOnlinePack )
REGISTER_SCREEN_CLASS( ScreenNetSelectBase ); REGISTER_SCREEN_CLASS( ScreenNetSelectBase );
ScreenNetSelectBase::ScreenNetSelectBase( const CString& sName ) : ScreenWithMenuElements( sName ) ScreenNetSelectBase::ScreenNetSelectBase( const CString& sName ) : ScreenWithMenuElements( sName )
stepmania/src/ScreenNetSelectMusic.cpp
+6 -5
View File
@@ -22,11 +22,12 @@
#include "RageLog.h" #include "RageLog.h"
#include "ScreenPlayerOptions.h" // for SM_BackFromPlayerOptions #include "ScreenPlayerOptions.h" // for SM_BackFromPlayerOptions
const AutoScreenMessage SM_NoSongs; AutoScreenMessage( SM_NoSongs )
const AutoScreenMessage SM_ChangeSong; AutoScreenMessage( SM_ChangeSong )
const AutoScreenMessage SM_SMOnlinePack; //Unused, but should be known AutoScreenMessage( SM_SMOnlinePack )
const AutoScreenMessage SM_SetWheelSong; AutoScreenMessage( SM_SetWheelSong )
const AutoScreenMessage SM_RefreshWheelLocation; AutoScreenMessage( SM_RefreshWheelLocation )
AutoScreenMessage( SM_SongChanged )
const CString AllGroups = "[ALL MUSIC]"; const CString AllGroups = "[ALL MUSIC]";
stepmania/src/ScreenNetworkOptions.cpp
+2 -2
View File
@@ -28,8 +28,8 @@ OptionRowDefinition g_NetworkOptionsLines[NUM_NETWORK_OPTIONS_LINES] = {
OptionRowDefinition( "Server", true, "PRESS START" ) OptionRowDefinition( "Server", true, "PRESS START" )
}; };
const AutoScreenMessage SM_DoneConnecting; AutoScreenMessage( SM_DoneConnecting )
const AutoScreenMessage SM_ServerNameEnter; AutoScreenMessage( SM_ServerNameEnter )
static Preference<CString> g_sLastServer( Options, "LastConnectedServer", "" ); static Preference<CString> g_sLastServer( Options, "LastConnectedServer", "" );
stepmania/src/ScreenPackages.cpp
+1 -1
View File
@@ -18,7 +18,7 @@
#define NUM_PACKAGES_SHOW THEME->GetMetricI(m_sName,"NumPackagesShow") #define NUM_PACKAGES_SHOW THEME->GetMetricI(m_sName,"NumPackagesShow")
#define NUM_LINKS_SHOW THEME->GetMetricI(m_sName,"NumLinksShow") #define NUM_LINKS_SHOW THEME->GetMetricI(m_sName,"NumLinksShow")
const AutoScreenMessage SM_BackFromURL; AutoScreenMessage( SM_BackFromURL )
REGISTER_SCREEN_CLASS( ScreenPackages ); REGISTER_SCREEN_CLASS( ScreenPackages );
ScreenPackages::ScreenPackages( CString sClassName ) : ScreenWithMenuElements( sClassName ) ScreenPackages::ScreenPackages( CString sClassName ) : ScreenWithMenuElements( sClassName )
stepmania/src/ScreenPlayerOptions.cpp
-2
View File
@@ -14,8 +14,6 @@
#include "PlayerState.h" #include "PlayerState.h"
#include "Foreach.h" #include "Foreach.h"
const AutoScreenMessage SM_BackFromPlayerOptions;
#define PREV_SCREEN THEME->GetMetric ("ScreenPlayerOptions","PrevScreen") #define PREV_SCREEN THEME->GetMetric ("ScreenPlayerOptions","PrevScreen")
#define NEXT_SCREEN THEME->GetMetric ("ScreenPlayerOptions","NextScreen") #define NEXT_SCREEN THEME->GetMetric ("ScreenPlayerOptions","NextScreen")
stepmania/src/ScreenPlayerOptions.h
+1 -1
View File
@@ -3,7 +3,7 @@
#include "ScreenOptionsMaster.h" #include "ScreenOptionsMaster.h"
extern const AutoScreenMessage SM_BackFromPlayerOptions; AutoScreenMessage( SM_BackFromPlayerOptions )
class ScreenPlayerOptions : public ScreenOptionsMaster class ScreenPlayerOptions : public ScreenOptionsMaster
{ {
stepmania/src/ScreenProfileOptions.cpp
+3 -3
View File
@@ -32,9 +32,9 @@ OptionRowDefinition g_ProfileOptionsLines[NUM_PROFILE_OPTIONS_LINES] = {
OptionRowDefinition( "OsMountPlayer2", true, "" ), OptionRowDefinition( "OsMountPlayer2", true, "" ),
}; };
const AutoScreenMessage SM_DoneCreating; AutoScreenMessage( SM_DoneCreating )
const AutoScreenMessage SM_DoneRenaming; AutoScreenMessage( SM_DoneRenaming )
const AutoScreenMessage SM_DoneDeleting; AutoScreenMessage( SM_DoneDeleting )
REGISTER_SCREEN_CLASS( ScreenProfileOptions ); REGISTER_SCREEN_CLASS( ScreenProfileOptions );
ScreenProfileOptions::ScreenProfileOptions( CString sClassName ) : ScreenOptions( sClassName ) ScreenProfileOptions::ScreenProfileOptions( CString sClassName ) : ScreenOptions( sClassName )
stepmania/src/ScreenRanking.cpp
+2 -2
View File
@@ -43,8 +43,8 @@ XToString( PageType, NUM_PAGE_TYPES );
#define COURSE_DIFFICULTY_X(col) (COURSE_DIFFICULTY_START_X+COL_SPACING_X*col) #define COURSE_DIFFICULTY_X(col) (COURSE_DIFFICULTY_START_X+COL_SPACING_X*col)
#define COURSE_SCORE_OFFSET_X(col) (COURSE_SCORE_OFFSET_START_X+COL_SPACING_X*col) #define COURSE_SCORE_OFFSET_X(col) (COURSE_SCORE_OFFSET_START_X+COL_SPACING_X*col)
const AutoScreenMessage SM_ShowNextPage; AutoScreenMessage( SM_ShowNextPage )
const AutoScreenMessage SM_HidePage; AutoScreenMessage( SM_HidePage )
static void GetAllSongsToShow( vector<Song*> &vpOut ) static void GetAllSongsToShow( vector<Song*> &vpOut )
stepmania/src/ScreenSMOnlineLogin.cpp
+4 -2
View File
@@ -18,8 +18,10 @@ REGISTER_SCREEN_CLASS(ScreenSMOnlineLogin);
#define PREV_SCREEN THEME->GetMetric (m_sName,"PrevScreen") #define PREV_SCREEN THEME->GetMetric (m_sName,"PrevScreen")
#define NEXT_SCREEN THEME->GetMetric (m_sName,"NextScreen") #define NEXT_SCREEN THEME->GetMetric (m_sName,"NextScreen")
const AutoScreenMessage SM_SMOnlinePack;
const AutoScreenMessage SM_PasswordDone; AutoScreenMessage( SM_SMOnlinePack )
AutoScreenMessage( SM_PasswordDone )
OptionRowDefinition g_ProfileLine[1] = { OptionRowDefinition g_ProfileLine[1] = {
OptionRowDefinition("Profile",false) OptionRowDefinition("Profile",false)
}; };
stepmania/src/ScreenSelect.cpp
-2
View File
@@ -18,8 +18,6 @@
#include "LightsManager.h" #include "LightsManager.h"
#include "Command.h" #include "Command.h"
const AutoScreenMessage SM_AllDoneChoosing;
#define CHOICE_NAMES THEME->GetMetric (m_sName,"ChoiceNames") #define CHOICE_NAMES THEME->GetMetric (m_sName,"ChoiceNames")
#define CHOICE( sChoiceName ) THEME->GetMetricM(m_sName,ssprintf("Choice%s",sChoiceName.c_str())) #define CHOICE( sChoiceName ) THEME->GetMetricM(m_sName,ssprintf("Choice%s",sChoiceName.c_str()))
#define CODE_NAMES THEME->GetMetric (m_sName,"CodeNames") #define CODE_NAMES THEME->GetMetric (m_sName,"CodeNames")
stepmania/src/ScreenSelect.h
+1 -1
View File
@@ -9,7 +9,7 @@
#include "ThemeMetric.h" #include "ThemeMetric.h"
// Derived classes must send this when done // Derived classes must send this when done
extern const AutoScreenMessage SM_AllDoneChoosing; AutoScreenMessage( SM_AllDoneChoosing )
class ScreenSelect : public ScreenWithMenuElements class ScreenSelect : public ScreenWithMenuElements
{ {
stepmania/src/ScreenSelectMaster.cpp
+1 -2
View File
@@ -14,8 +14,7 @@
#include "Foreach.h" #include "Foreach.h"
#include "RageSoundManager.h" #include "RageSoundManager.h"
AutoScreenMessage( SM_PlayPostSwitchPage )
const AutoScreenMessage SM_PlayPostSwitchPage;
CString CURSOR_OFFSET_X_FROM_ICON_NAME( size_t p, size_t part ) { return ssprintf("CursorPart%dP%dOffsetXFromIcon",int(part+1),int(p+1)); } CString CURSOR_OFFSET_X_FROM_ICON_NAME( size_t p, size_t part ) { return ssprintf("CursorPart%dP%dOffsetXFromIcon",int(part+1),int(p+1)); }
CString CURSOR_OFFSET_Y_FROM_ICON_NAME( size_t p, size_t part ) { return ssprintf("CursorPart%dP%dOffsetYFromIcon",int(part+1),int(p+1)); } CString CURSOR_OFFSET_Y_FROM_ICON_NAME( size_t p, size_t part ) { return ssprintf("CursorPart%dP%dOffsetYFromIcon",int(part+1),int(p+1)); }
stepmania/src/ScreenSelectMusic.cpp
+4 -1
View File
@@ -37,7 +37,10 @@ const int NUM_SCORE_DIGITS = 9;
#define SCORE_SORT_CHANGE_COMMAND(i) THEME->GetMetricA(m_sName,ssprintf("ScoreP%iSortChangeCommand", i+1)) #define SCORE_SORT_CHANGE_COMMAND(i) THEME->GetMetricA(m_sName,ssprintf("ScoreP%iSortChangeCommand", i+1))
#define SCORE_FRAME_SORT_CHANGE_COMMAND(i) THEME->GetMetricA(m_sName,ssprintf("ScoreFrameP%iSortChangeCommand", i+1)) #define SCORE_FRAME_SORT_CHANGE_COMMAND(i) THEME->GetMetricA(m_sName,ssprintf("ScoreFrameP%iSortChangeCommand", i+1))
static const AutoScreenMessage SM_AllowOptionsMenuRepeat; AutoScreenMessage( SM_AllowOptionsMenuRepeat )
AutoScreenMessage( SM_SongChanged )
AutoScreenMessage( SM_SortOrderChanging )
AutoScreenMessage( SM_SortOrderChanged )
static CString g_sCDTitlePath; static CString g_sCDTitlePath;
static bool g_bWantFallbackCdTitle; static bool g_bWantFallbackCdTitle;
stepmania/src/ScreenSongOptions.cpp
-2
View File
@@ -6,8 +6,6 @@
#include "ThemeManager.h" #include "ThemeManager.h"
#include "PrefsManager.h" #include "PrefsManager.h"
const AutoScreenMessage SM_BackFromSongOptions;
#define PREV_SCREEN THEME->GetMetric ("ScreenSongOptions","PrevScreen") #define PREV_SCREEN THEME->GetMetric ("ScreenSongOptions","PrevScreen")
#define NEXT_SCREEN THEME->GetMetric ("ScreenSongOptions","NextScreen") #define NEXT_SCREEN THEME->GetMetric ("ScreenSongOptions","NextScreen")
stepmania/src/ScreenSongOptions.h
+1 -1
View File
@@ -3,7 +3,7 @@
#include "ScreenOptionsMaster.h" #include "ScreenOptionsMaster.h"
extern const AutoScreenMessage SM_BackFromSongOptions; AutoScreenMessage( SM_BackFromSongOptions )
class ScreenSongOptions : public ScreenOptionsMaster class ScreenSongOptions : public ScreenOptionsMaster
{ {
stepmania/src/ScreenSplash.cpp
+1 -1
View File
@@ -3,7 +3,7 @@
#include "ThemeManager.h" #include "ThemeManager.h"
#include "RageUtil.h" #include "RageUtil.h"
const AutoScreenMessage SM_PrepScreen; AutoScreenMessage( SM_PrepScreen )
REGISTER_SCREEN_CLASS( ScreenSplash ); REGISTER_SCREEN_CLASS( ScreenSplash );
stepmania/src/ScreenStage.cpp
+1 -1
View File
@@ -19,7 +19,7 @@
#define PREV_SCREEN THEME->GetMetric (m_sName,"PrevScreen") #define PREV_SCREEN THEME->GetMetric (m_sName,"PrevScreen")
#define MINIMUM_DELAY THEME->GetMetricF(m_sName,"MinimumDelay") #define MINIMUM_DELAY THEME->GetMetricF(m_sName,"MinimumDelay")
const AutoScreenMessage SM_PrepScreen; AutoScreenMessage( SM_PrepScreen )
REGISTER_SCREEN_CLASS( ScreenStage ); REGISTER_SCREEN_CLASS( ScreenStage );
ScreenStage::ScreenStage( CString sClassName ) : Screen( sClassName ) ScreenStage::ScreenStage( CString sClassName ) : Screen( sClassName )
stepmania/src/ScreenStyleSplash.cpp
+2 -2
View File
@@ -16,8 +16,8 @@
#define NONSTOP_SCREEN THEME->GetMetric("ScreenStyleSplash","NonstopScreen") #define NONSTOP_SCREEN THEME->GetMetric("ScreenStyleSplash","NonstopScreen")
#define ONI_SCREEN THEME->GetMetric("ScreenStyleSplash","OniScreen") #define ONI_SCREEN THEME->GetMetric("ScreenStyleSplash","OniScreen")
const AutoScreenMessage SM_DoneOpening; AutoScreenMessage( SM_DoneOpening )
const AutoScreenMessage SM_StartClosing; AutoScreenMessage( SM_StartClosing )
REGISTER_SCREEN_CLASS( ScreenStyleSplash ); REGISTER_SCREEN_CLASS( ScreenStyleSplash );
stepmania/src/ScreenTestFonts.cpp
+2 -1
View File
@@ -17,7 +17,8 @@ void ChangeText(CString txt)
{ {
CustomText = txt; CustomText = txt;
} }
const AutoScreenMessage SM_ChangeText;
AutoScreenMessage( SM_ChangeText )
void ScreenTestFonts::HandleScreenMessage( const ScreenMessage SM ) void ScreenTestFonts::HandleScreenMessage( const ScreenMessage SM )
{ {