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

ScreenBranch: use ModeChoice

Browse Source
This commit is contained in:
Glenn Maynard
2004-02-16 04:31:18 +00:00
parent 3906ea166f
commit d075baa5d1
2 changed files with 10 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/Themes/default/metrics.ini
+2 -2
View File
@@ -3664,8 +3664,8 @@ Class=ScreenBranch
Choices=Credits,MusicScroll Choices=Credits,MusicScroll
ConditionCredits=GetBestFinalGrade() <= Grade("AA") ConditionCredits=GetBestFinalGrade() <= Grade("AA")
ConditionMusicScroll=true ConditionMusicScroll=true
NextScreenCredits=ScreenCredits NextScreenCredits=screen,ScreenCredits
NextScreenMusicScroll=ScreenMusicScroll NextScreenMusicScroll=screen,ScreenMusicScroll
[EditMenu] [EditMenu]
Arrows1X=190 Arrows1X=190
stepmania/src/ScreenBranch.cpp
+8 -1
View File
@@ -15,6 +15,7 @@
#include "ScreenManager.h" #include "ScreenManager.h"
#include "ThemeManager.h" #include "ThemeManager.h"
#include "LuaHelpers.h" #include "LuaHelpers.h"
#include "ModeChoice.h"
#define CHOICES THEME->GetMetric (m_sName,"Choices") #define CHOICES THEME->GetMetric (m_sName,"Choices")
#define CONDITION(choice) THEME->GetMetric (m_sName,"Condition"+choice) #define CONDITION(choice) THEME->GetMetric (m_sName,"Condition"+choice)
@@ -50,7 +51,13 @@ void ScreenBranch::HandleScreenMessage( const ScreenMessage SM )
{ {
CString sNextScreen = NEXT_SCREEN(m_sChoice); CString sNextScreen = NEXT_SCREEN(m_sChoice);
LOG->Trace( "Branching to '%s'", sNextScreen.c_str() ); LOG->Trace( "Branching to '%s'", sNextScreen.c_str() );
SCREENMAN->SetNewScreen( sNextScreen );
ModeChoice mc;
mc.Load( 0, sNextScreen );
if( mc.m_sScreen == "" )
RageException::Throw("Metric %s::%s must set \"screen\"",
m_sName, ("NextScreen"+m_sChoice).c_str() );
mc.ApplyToAllPlayers();
} }
break; break;
} }