move SM_NotesEnded into ScreenGameplay.h so that it can be shared

This commit is contained in:
Chris Danford
2005-03-14 13:29:19 +00:00
parent bd331e4d0b
commit dbbdfc14ce
4 changed files with 2 additions and 5 deletions
-2
View File
@@ -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 )
-1
View File
@@ -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
+2
View File
@@ -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
{
-2
View File
@@ -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 )