diff --git a/src/MusicWheel.cpp b/src/MusicWheel.cpp index 9c81215790..2c31041280 100644 --- a/src/MusicWheel.cpp +++ b/src/MusicWheel.cpp @@ -30,7 +30,7 @@ static Preference g_bMoveRandomToEnd( "MoveRandomToEnd", false ); static RString SECTION_COLORS_NAME( size_t i ) { return ssprintf("SectionColor%d",int(i+1)); } static RString CHOICE_NAME( RString s ) { return ssprintf("Choice%s",s.c_str()); } -AutoScreenMessage( SM_SongChanged ) // TODO: Replace this with a Message and MESSAGEMAN +AutoScreenMessage( SM_SongChanged ); // TODO: Replace this with a Message and MESSAGEMAN AutoScreenMessage( SM_SortOrderChanging ); AutoScreenMessage( SM_SortOrderChanged ); diff --git a/src/NetworkSyncManager.cpp b/src/NetworkSyncManager.cpp index c762fa3239..6ef6f83c2a 100644 --- a/src/NetworkSyncManager.cpp +++ b/src/NetworkSyncManager.cpp @@ -43,7 +43,7 @@ void NetworkSyncManager::GetListOfLANServers( vector& AllServers #include "PlayerState.h" #include "CryptManager.h" -AutoScreenMessage( SM_AddToChat ) +AutoScreenMessage( SM_AddToChat ); AutoScreenMessage( SM_ChangeSong ); AutoScreenMessage( SM_GotEval ); AutoScreenMessage( SM_UsersUpdate ); diff --git a/src/RoomInfoDisplay.cpp b/src/RoomInfoDisplay.cpp index b86f3b33e2..0a2bc9b977 100644 --- a/src/RoomInfoDisplay.cpp +++ b/src/RoomInfoDisplay.cpp @@ -5,8 +5,8 @@ #include "NetworkSyncManager.h" #include "LocalizedString.h" -AutoScreenMessage( SM_RoomInfoRetract ) -AutoScreenMessage( SM_RoomInfoDeploy ) +AutoScreenMessage( SM_RoomInfoRetract ); +AutoScreenMessage( SM_RoomInfoDeploy ); static LocalizedString LAST_ROUND_INFO ( "RoomInfoDisplay", "Last Round Info:" ); static LocalizedString ROOM_NAME ( "RoomInfoDisplay", "Room Name:" ); diff --git a/src/RoomWheel.cpp b/src/RoomWheel.cpp index 77d9087676..9013068fbd 100644 --- a/src/RoomWheel.cpp +++ b/src/RoomWheel.cpp @@ -8,9 +8,9 @@ #include "ScreenManager.h" #include "ActorUtil.h" -AutoScreenMessage( SM_BackFromRoomName ) -AutoScreenMessage( SM_RoomInfoRetract ) -AutoScreenMessage( SM_RoomInfoDeploy ) +AutoScreenMessage( SM_BackFromRoomName ); +AutoScreenMessage( SM_RoomInfoRetract ); +AutoScreenMessage( SM_RoomInfoDeploy ); RoomWheel::~RoomWheel() { diff --git a/src/ScreenAttract.h b/src/ScreenAttract.h index 68a2837836..a4494b3d7f 100644 --- a/src/ScreenAttract.h +++ b/src/ScreenAttract.h @@ -5,7 +5,7 @@ #include "ScreenWithMenuElements.h" -AutoScreenMessage( SM_GoToStartScreen ) +AutoScreenMessage( SM_GoToStartScreen ); class ScreenAttract : public ScreenWithMenuElements { diff --git a/src/ScreenEditMenu.cpp b/src/ScreenEditMenu.cpp index 7a8e6d9e40..961e793120 100644 --- a/src/ScreenEditMenu.cpp +++ b/src/ScreenEditMenu.cpp @@ -24,8 +24,8 @@ static const RString TEMP_FILE_NAME = "--temp--"; #define EXPLANATION_TEXT( row ) THEME->GetString(m_sName,"Explanation"+EditMenuRowToString(row)) #define EDIT_MENU_TYPE THEME->GetMetric(m_sName,"EditMenuType") -AutoScreenMessage( SM_RefreshSelector ) -AutoScreenMessage( SM_BackFromEditDescription ) +AutoScreenMessage( SM_RefreshSelector ); +AutoScreenMessage( SM_BackFromEditDescription ); REGISTER_SCREEN_CLASS( ScreenEditMenu ); diff --git a/src/ScreenEvaluation.cpp b/src/ScreenEvaluation.cpp index fa28f8fb5b..ee24a8187c 100644 --- a/src/ScreenEvaluation.cpp +++ b/src/ScreenEvaluation.cpp @@ -74,7 +74,7 @@ XToString( DetailLine ); static const int NUM_SHOWN_RADAR_CATEGORIES = 5; -AutoScreenMessage( SM_PlayCheer ) +AutoScreenMessage( SM_PlayCheer ); REGISTER_SCREEN_CLASS( ScreenEvaluation ); void ScreenEvaluation::Init() diff --git a/src/ScreenGameplay.cpp b/src/ScreenGameplay.cpp index 7978ab8b8c..a885fc37cb 100644 --- a/src/ScreenGameplay.cpp +++ b/src/ScreenGameplay.cpp @@ -71,19 +71,19 @@ static ThemeMetric INITIAL_BACKGROUND_BRIGHTNESS ("ScreenGameplay","Initi static ThemeMetric SECONDS_BETWEEN_COMMENTS ("ScreenGameplay","SecondsBetweenComments"); static ThemeMetric SCORE_KEEPER_CLASS ("ScreenGameplay","ScoreKeeperClass"); -AutoScreenMessage( SM_PlayGo ) +AutoScreenMessage( SM_PlayGo ); // received while STATE_DANCING -AutoScreenMessage( SM_LoadNextSong ) -AutoScreenMessage( SM_StartLoadingNextSong ) +AutoScreenMessage( SM_LoadNextSong ); +AutoScreenMessage( SM_StartLoadingNextSong ); // received while STATE_OUTRO -AutoScreenMessage( SM_DoPrevScreen ) -AutoScreenMessage( SM_DoNextScreen ) +AutoScreenMessage( SM_DoPrevScreen ); +AutoScreenMessage( SM_DoNextScreen ); // received while STATE_INTRO -AutoScreenMessage( SM_StartHereWeGo ) -AutoScreenMessage( SM_StopHereWeGo ) +AutoScreenMessage( SM_StartHereWeGo ); +AutoScreenMessage( SM_StopHereWeGo ); AutoScreenMessage( SM_BattleTrickLevel1 ); AutoScreenMessage( SM_BattleTrickLevel2 ); diff --git a/src/ScreenMessage.h b/src/ScreenMessage.h index 9f92f4f8f0..de01907747 100644 --- a/src/ScreenMessage.h +++ b/src/ScreenMessage.h @@ -26,7 +26,7 @@ namespace ScreenMessageHelpers // Automatically generate a unique ScreenMessage value #define AutoScreenMessage( x ) \ - const ScreenMessage x = ScreenMessageHelpers::ToScreenMessage( #x ); + const ScreenMessage x = ScreenMessageHelpers::ToScreenMessage( #x ) #endif diff --git a/src/ScreenMiniMenu.cpp b/src/ScreenMiniMenu.cpp index b318616bbd..0139716d92 100644 --- a/src/ScreenMiniMenu.cpp +++ b/src/ScreenMiniMenu.cpp @@ -10,8 +10,8 @@ #include "OptionRowHandler.h" #include "PrefsManager.h" -AutoScreenMessage( SM_GoToOK ) -AutoScreenMessage( SM_GoToCancel ) +AutoScreenMessage( SM_GoToOK ); +AutoScreenMessage( SM_GoToCancel ); bool ScreenMiniMenu::s_bCancelled = false; int ScreenMiniMenu::s_iLastRowCode = -1; diff --git a/src/ScreenNetEvaluation.cpp b/src/ScreenNetEvaluation.cpp index 247d4b79c4..99199e0d8a 100644 --- a/src/ScreenNetEvaluation.cpp +++ b/src/ScreenNetEvaluation.cpp @@ -19,7 +19,7 @@ static const int NUM_SCORE_DIGITS = 9; #define MAX_COMBO_NUM_DIGITS THEME->GetMetricI("ScreenEvaluation","MaxComboNumDigits") -static AutoScreenMessage( SM_GotEval ) +static AutoScreenMessage( SM_GotEval ); REGISTER_SCREEN_CLASS( ScreenNetEvaluation ); diff --git a/src/ScreenNetRoom.cpp b/src/ScreenNetRoom.cpp index e6d7362977..db99a368aa 100644 --- a/src/ScreenNetRoom.cpp +++ b/src/ScreenNetRoom.cpp @@ -11,13 +11,13 @@ #include "InputEventPlus.h" #include "LocalizedString.h" -AutoScreenMessage( SM_SMOnlinePack ) -AutoScreenMessage( SM_BackFromRoomName ) -AutoScreenMessage( SM_BackFromRoomDesc ) -AutoScreenMessage( SM_BackFromRoomPass ) -AutoScreenMessage( SM_BackFromReqPass ) -AutoScreenMessage( SM_RoomInfoRetract ) -AutoScreenMessage( SM_RoomInfoDeploy ) +AutoScreenMessage( SM_SMOnlinePack ); +AutoScreenMessage( SM_BackFromRoomName ); +AutoScreenMessage( SM_BackFromRoomDesc ); +AutoScreenMessage( SM_BackFromRoomPass ); +AutoScreenMessage( SM_BackFromReqPass ); +AutoScreenMessage( SM_RoomInfoRetract ); +AutoScreenMessage( SM_RoomInfoDeploy ); static LocalizedString ENTER_ROOM_DESCRIPTION ("ScreenNetRoom","Enter a description for the room:"); static LocalizedString ENTER_ROOM_PASSWORD ("ScreenNetRoom","Enter a password for the room (blank, no password):"); diff --git a/src/ScreenNetSelectBase.cpp b/src/ScreenNetSelectBase.cpp index 5d7cf813e6..8dfd75f7c3 100644 --- a/src/ScreenNetSelectBase.cpp +++ b/src/ScreenNetSelectBase.cpp @@ -26,9 +26,9 @@ #define USER_SPACING_X THEME->GetMetricF(m_sName,"UserSpacingX") #define USER_ADD_Y THEME->GetMetricF(m_sName,"UserLine2Y") -AutoScreenMessage( SM_AddToChat ) -AutoScreenMessage( SM_UsersUpdate ) -AutoScreenMessage( SM_SMOnlinePack ) +AutoScreenMessage( SM_AddToChat ); +AutoScreenMessage( SM_UsersUpdate ); +AutoScreenMessage( SM_SMOnlinePack ); REGISTER_SCREEN_CLASS( ScreenNetSelectBase ); diff --git a/src/ScreenNetSelectMusic.cpp b/src/ScreenNetSelectMusic.cpp index 4cbc1e8733..a1969836fe 100644 --- a/src/ScreenNetSelectMusic.cpp +++ b/src/ScreenNetSelectMusic.cpp @@ -26,14 +26,14 @@ #include "SongManager.h" #include "CodeDetector.h" -AutoScreenMessage( SM_NoSongs ) -AutoScreenMessage( SM_ChangeSong ) -AutoScreenMessage( SM_SMOnlinePack ) -AutoScreenMessage( SM_SetWheelSong ) -AutoScreenMessage( SM_RefreshWheelLocation ) -AutoScreenMessage( SM_SongChanged ) -AutoScreenMessage( SM_UsersUpdate ) -AutoScreenMessage( SM_BackFromPlayerOptions ) +AutoScreenMessage( SM_NoSongs ); +AutoScreenMessage( SM_ChangeSong ); +AutoScreenMessage( SM_SMOnlinePack ); +AutoScreenMessage( SM_SetWheelSong ); +AutoScreenMessage( SM_RefreshWheelLocation ); +AutoScreenMessage( SM_SongChanged ); +AutoScreenMessage( SM_UsersUpdate ); +AutoScreenMessage( SM_BackFromPlayerOptions ); REGISTER_SCREEN_CLASS( ScreenNetSelectMusic ); diff --git a/src/ScreenNetworkOptions.cpp b/src/ScreenNetworkOptions.cpp index 51d8dff800..c90545523e 100644 --- a/src/ScreenNetworkOptions.cpp +++ b/src/ScreenNetworkOptions.cpp @@ -36,7 +36,7 @@ enum DisplayScoreboard NO_SCOREBOARD_ON }; -AutoScreenMessage( SM_DoneConnecting ) +AutoScreenMessage( SM_DoneConnecting ); Preference g_sLastServer( "LastConnectedServer", "" ); diff --git a/src/ScreenOptions.h b/src/ScreenOptions.h index 8e23a14f00..d9d96273d4 100644 --- a/src/ScreenOptions.h +++ b/src/ScreenOptions.h @@ -14,7 +14,7 @@ class OptionRowHandler; -AutoScreenMessage( SM_ExportOptions ) +AutoScreenMessage( SM_ExportOptions ); /** @brief The list of input modes for the given row. */ enum InputMode diff --git a/src/ScreenOptionsCourseOverview.cpp b/src/ScreenOptionsCourseOverview.cpp index 21ed2b4ca3..65219a6c53 100644 --- a/src/ScreenOptionsCourseOverview.cpp +++ b/src/ScreenOptionsCourseOverview.cpp @@ -57,9 +57,9 @@ static LocalizedString ERROR_DELETING_FILE ("ScreenOptionsCourseOverview", static LocalizedString COURSE_WILL_BE_LOST ("ScreenOptionsCourseOverview", "This course will be lost permanently."); static LocalizedString CONTINUE_WITH_DELETE ("ScreenOptionsCourseOverview", "Continue with delete?"); -AutoScreenMessage( SM_BackFromEnterName ) -AutoScreenMessage( SM_BackFromRename ) -AutoScreenMessage( SM_BackFromDelete ) +AutoScreenMessage( SM_BackFromEnterName ); +AutoScreenMessage( SM_BackFromRename ); +AutoScreenMessage( SM_BackFromDelete ); void ScreenOptionsCourseOverview::Init() { diff --git a/src/ScreenOptionsManageEditSteps.cpp b/src/ScreenOptionsManageEditSteps.cpp index 2c49ddc879..ee5d23807c 100644 --- a/src/ScreenOptionsManageEditSteps.cpp +++ b/src/ScreenOptionsManageEditSteps.cpp @@ -20,9 +20,9 @@ #include "SpecialFiles.h" #include "NotesWriterSM.h" -AutoScreenMessage( SM_BackFromRename ) -AutoScreenMessage( SM_BackFromDelete ) -AutoScreenMessage( SM_BackFromContextMenu ) +AutoScreenMessage( SM_BackFromRename ); +AutoScreenMessage( SM_BackFromDelete ); +AutoScreenMessage( SM_BackFromContextMenu ); enum StepsEditAction { diff --git a/src/ScreenOptionsManageProfiles.cpp b/src/ScreenOptionsManageProfiles.cpp index f8dbca6666..7c75399601 100644 --- a/src/ScreenOptionsManageProfiles.cpp +++ b/src/ScreenOptionsManageProfiles.cpp @@ -16,11 +16,11 @@ static LocalizedString NEW_PROFILE_DEFAULT_NAME( "ScreenOptionsManageProfiles", #define SHOW_CREATE_NEW (!PROFILEMAN->FixedProfiles()) -AutoScreenMessage( SM_BackFromEnterNameForNew ) -AutoScreenMessage( SM_BackFromRename ) -AutoScreenMessage( SM_BackFromDeleteConfirm ) -AutoScreenMessage( SM_BackFromClearConfirm ) -AutoScreenMessage( SM_BackFromContextMenu ) +AutoScreenMessage( SM_BackFromEnterNameForNew ); +AutoScreenMessage( SM_BackFromRename ); +AutoScreenMessage( SM_BackFromDeleteConfirm ); +AutoScreenMessage( SM_BackFromClearConfirm ); +AutoScreenMessage( SM_BackFromContextMenu ); enum ProfileAction { diff --git a/src/ScreenPackages.cpp b/src/ScreenPackages.cpp index ba115a715e..7e35aa4148 100644 --- a/src/ScreenPackages.cpp +++ b/src/ScreenPackages.cpp @@ -14,7 +14,7 @@ #include #include "LocalizedString.h" -AutoScreenMessage( SM_BackFromURL ) +AutoScreenMessage( SM_BackFromURL ); REGISTER_SCREEN_CLASS( ScreenPackages ); diff --git a/src/ScreenRanking.cpp b/src/ScreenRanking.cpp index 16833db8bc..f1c2d0dbea 100644 --- a/src/ScreenRanking.cpp +++ b/src/ScreenRanking.cpp @@ -15,8 +15,8 @@ static const char *RankingTypeNames[] = { XToString( RankingType ); LuaXType( RankingType ); -AutoScreenMessage( SM_ShowNextPage ) -AutoScreenMessage( SM_HidePage ) +AutoScreenMessage( SM_ShowNextPage ); +AutoScreenMessage( SM_HidePage ); REGISTER_SCREEN_CLASS( ScreenRanking ); diff --git a/src/ScreenSMOnlineLogin.cpp b/src/ScreenSMOnlineLogin.cpp index 1ddf9b0bc6..bca827b014 100644 --- a/src/ScreenSMOnlineLogin.cpp +++ b/src/ScreenSMOnlineLogin.cpp @@ -17,9 +17,9 @@ REGISTER_SCREEN_CLASS(ScreenSMOnlineLogin); -AutoScreenMessage( SM_SMOnlinePack ) -AutoScreenMessage( SM_PasswordDone ) -AutoScreenMessage( SM_NoProfilesDefined ) +AutoScreenMessage( SM_SMOnlinePack ); +AutoScreenMessage( SM_PasswordDone ); +AutoScreenMessage( SM_NoProfilesDefined ); static LocalizedString DEFINE_A_PROFILE( "ScreenSMOnlineLogin", "You must define a Profile." ); void ScreenSMOnlineLogin::Init() diff --git a/src/ScreenSelectMaster.cpp b/src/ScreenSelectMaster.cpp index 1d0b7d4343..7f775ff215 100644 --- a/src/ScreenSelectMaster.cpp +++ b/src/ScreenSelectMaster.cpp @@ -22,7 +22,7 @@ static const char *MenuDirNames[] = { }; XToString( MenuDir ); -AutoScreenMessage( SM_PlayPostSwitchPage ) +AutoScreenMessage( SM_PlayPostSwitchPage ); static RString CURSOR_OFFSET_X_FROM_ICON_NAME( size_t p ) { return ssprintf("CursorP%dOffsetXFromIcon",int(p+1)); } static RString CURSOR_OFFSET_Y_FROM_ICON_NAME( size_t p ) { return ssprintf("CursorP%dOffsetYFromIcon",int(p+1)); } diff --git a/src/ScreenSelectMusic.cpp b/src/ScreenSelectMusic.cpp index b9c7014a2a..f28d6a0396 100644 --- a/src/ScreenSelectMusic.cpp +++ b/src/ScreenSelectMusic.cpp @@ -38,15 +38,16 @@ static const char *SelectionStateNames[] = { }; XToString( SelectionState ); +/** @brief The maximum number of digits for the ScoreDisplay. */ const int NUM_SCORE_DIGITS = 9; #define SHOW_OPTIONS_MESSAGE_SECONDS THEME->GetMetricF( m_sName, "ShowOptionsMessageSeconds" ) -AutoScreenMessage( SM_AllowOptionsMenuRepeat ) -AutoScreenMessage( SM_SongChanged ) -AutoScreenMessage( SM_SortOrderChanging ) -AutoScreenMessage( SM_SortOrderChanged ) -AutoScreenMessage( SM_BackFromPlayerOptions ) +AutoScreenMessage( SM_AllowOptionsMenuRepeat ); +AutoScreenMessage( SM_SongChanged ); +AutoScreenMessage( SM_SortOrderChanging ); +AutoScreenMessage( SM_SortOrderChanged ); +AutoScreenMessage( SM_BackFromPlayerOptions ); static RString g_sCDTitlePath; static bool g_bWantFallbackCdTitle; diff --git a/src/ScreenTestFonts.cpp b/src/ScreenTestFonts.cpp index 530a037256..9178700ace 100644 --- a/src/ScreenTestFonts.cpp +++ b/src/ScreenTestFonts.cpp @@ -11,7 +11,9 @@ static const float LineWidth = 400; static const float LineHeight = 50; +/** @brief A quick way of getting a font metric. */ #define FONT( i ) THEME->GetMetric (m_sName,ssprintf("Font%i",i)) +/** @brief A quick way of getting a particular string. */ #define TEXT( i ) THEME->GetString (m_sName,ssprintf("Text%i",i)) static RString g_sCustomText; @@ -21,7 +23,7 @@ static void ChangeText( const RString &sText ) g_sCustomText = sText; } -AutoScreenMessage( SM_ChangeText ) +AutoScreenMessage( SM_ChangeText ); void ScreenTestFonts::HandleScreenMessage( const ScreenMessage SM ) { diff --git a/src/WheelBase.cpp b/src/WheelBase.cpp index d813ccb5d8..42dddc8bd0 100644 --- a/src/WheelBase.cpp +++ b/src/WheelBase.cpp @@ -17,7 +17,7 @@ #include "ScreenDimensions.h" const int MAX_WHEEL_SOUND_SPEED = 15; -AutoScreenMessage( SM_SongChanged ) // TODO: Replace this with a Message and MESSAGEMAN +AutoScreenMessage( SM_SongChanged ); // TODO: Replace this with a Message and MESSAGEMAN WheelBase::~WheelBase() {