From dbbdfc14ce89085d75d27f4024335b7ae5b9ef7f Mon Sep 17 00:00:00 2001 From: Chris Danford Date: Mon, 14 Mar 2005 13:29:19 +0000 Subject: [PATCH] move SM_NotesEnded into ScreenGameplay.h so that it can be shared --- stepmania/src/ScreenDemonstration.cpp | 2 -- stepmania/src/ScreenGameplay.cpp | 1 - stepmania/src/ScreenGameplay.h | 2 ++ stepmania/src/ScreenJukebox.cpp | 2 -- 4 files changed, 2 insertions(+), 5 deletions(-) diff --git a/stepmania/src/ScreenDemonstration.cpp b/stepmania/src/ScreenDemonstration.cpp index b113692cd1..1dfe4c3f60 100644 --- a/stepmania/src/ScreenDemonstration.cpp +++ b/stepmania/src/ScreenDemonstration.cpp @@ -14,8 +14,6 @@ #define SECONDS_TO_SHOW THEME->GetMetricF("ScreenDemonstration","SecondsToShow") #define NEXT_SCREEN THEME->GetMetric("ScreenDemonstration","NextScreen") -const ScreenMessage SM_NotesEnded = ScreenMessage(SM_User+10); // MUST be same as in ScreenGameplay - REGISTER_SCREEN_CLASS( ScreenDemonstration ); ScreenDemonstration::ScreenDemonstration( CString sName ) : ScreenJukebox( sName ) diff --git a/stepmania/src/ScreenGameplay.cpp b/stepmania/src/ScreenGameplay.cpp index 273f548b0b..ff3ccfa42d 100644 --- a/stepmania/src/ScreenGameplay.cpp +++ b/stepmania/src/ScreenGameplay.cpp @@ -71,7 +71,6 @@ const ScreenMessage SM_PlayGo = ScreenMessage(SM_User+1); // received while STATE_DANCING -const ScreenMessage SM_NotesEnded = ScreenMessage(SM_User+10); const ScreenMessage SM_LoadNextSong = ScreenMessage(SM_User+11); // received while STATE_OUTRO diff --git a/stepmania/src/ScreenGameplay.h b/stepmania/src/ScreenGameplay.h index 2d0faf9579..4f457709b2 100644 --- a/stepmania/src/ScreenGameplay.h +++ b/stepmania/src/ScreenGameplay.h @@ -27,6 +27,8 @@ class Inventory; #include "AutoKeysounds.h" #include "ThemeMetric.h" +const ScreenMessage SM_NotesEnded = ScreenMessage(SM_User+10); + class LyricsLoader; class ScreenGameplay : public Screen { diff --git a/stepmania/src/ScreenJukebox.cpp b/stepmania/src/ScreenJukebox.cpp index 5c30008d40..4145664e10 100644 --- a/stepmania/src/ScreenJukebox.cpp +++ b/stepmania/src/ScreenJukebox.cpp @@ -22,8 +22,6 @@ #define SHOW_COURSE_MODIFIERS THEME->GetMetricB("ScreenJukebox","ShowCourseModifiers") -const ScreenMessage SM_NotesEnded = ScreenMessage(SM_User+10); // MUST be same as in ScreenGameplay - REGISTER_SCREEN_CLASS( ScreenJukebox ); bool ScreenJukebox::SetSong( bool bDemonstration )