move SM_NotesEnded into ScreenGameplay.h so that it can be shared
This commit is contained in:
@@ -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 )
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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
|
||||
{
|
||||
|
||||
@@ -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 )
|
||||
|
||||
Reference in New Issue
Block a user