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

move skipping of SSelectGroup into a branch (fixes SSGroup::TweenOnScreen assert)

Browse Source
This commit is contained in:
Chris Danford
2005-10-15 06:20:59 +00:00
parent 8b7e6d6b92
commit c27dc12583
3 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/Themes/default/Scripts/Branches.lua
+5
View File
@@ -14,6 +14,11 @@ function ScreenCautionBranch()
return "ScreenSelectStyle" return "ScreenSelectStyle"
end end
function ScreenSelectGroupBranch()
if PREFSMAN:GetPreference("ShowSelectGroup") then return "ScreenSelectGroup" end
return GetScreenInstructions()
end
function SongSelectionScreen() function SongSelectionScreen()
local pm = GAMESTATE:GetPlayMode() local pm = GAMESTATE:GetPlayMode()
if pm==PLAY_MODE_NONSTOP then return "ScreenSelectCourseNonstop" end if pm==PLAY_MODE_NONSTOP then return "ScreenSelectCourseNonstop" end
stepmania/Themes/default/metrics.ini
+6 -6
View File
@@ -138,7 +138,7 @@ JoinMessageP2Y=SCREEN_CENTER_Y+96
TimerSeconds=40 TimerSeconds=40
TimerStealth=0 TimerStealth=0
StyleIcon=1 StyleIcon=1
NextScreen=ScreenSelectGroup NextScreen=@ScreenSelectGroupBranch()
PrevScreen=@ScreenTitleBranch() PrevScreen=@ScreenTitleBranch()
SilentWait=1 SilentWait=1
BounceJoinMessage=1 BounceJoinMessage=1
@@ -230,7 +230,7 @@ GuideY=SCREEN_CENTER_Y+134
TimerSeconds=30 TimerSeconds=30
TimerStealth=0 TimerStealth=0
StyleIcon=1 StyleIcon=1
NextScreen=ScreenSelectGroup NextScreen=@ScreenSelectGroupBranch()
ScrollingListX=SCREEN_CENTER_X+0 ScrollingListX=SCREEN_CENTER_X+0
ScrollingListY=SCREEN_CENTER_Y+10 ScrollingListY=SCREEN_CENTER_Y+10
UseSelectionBGAnimations=0 UseSelectionBGAnimations=0
@@ -255,10 +255,10 @@ CharacterIconP2OffCommand=linear,0.3;diffusealpha,0;sleep,10
Class=ScreenSelectDifficulty Class=ScreenSelectDifficulty
Fallback=ScreenSelect Fallback=ScreenSelect
ChoiceNames=1,2,3,4,5,6,7,8 ChoiceNames=1,2,3,4,5,6,7,8
Choice1=PlayMode,regular;Difficulty,beginner;name,beginner;screen,ScreenSelectGroup Choice1=@'PlayMode,regular;Difficulty,beginner;name,beginner;screen,'..ScreenSelectGroupBranch()
Choice2=PlayMode,regular;Difficulty,easy;name,easy;screen,ScreenSelectGroup Choice2=@'PlayMode,regular;Difficulty,easy;name,easy;screen,'..ScreenSelectGroupBranch()
Choice3=PlayMode,regular;Difficulty,medium;name,medium;screen,ScreenSelectGroup Choice3=@'PlayMode,regular;Difficulty,medium;name,medium;screen,'..ScreenSelectGroupBranch()
Choice4=PlayMode,regular;Difficulty,hard;name,hard;screen,ScreenSelectGroup Choice4=@'PlayMode,regular;Difficulty,hard;name,hard;screen,'..ScreenSelectGroupBranch()
Choice5=@'PlayMode,nonstop;name,nonstop;screen,'..GetScreenInstructions() Choice5=@'PlayMode,nonstop;name,nonstop;screen,'..GetScreenInstructions()
Choice6=@'PlayMode,oni;name,oni;screen,'..GetScreenInstructions() Choice6=@'PlayMode,oni;name,oni;screen,'..GetScreenInstructions()
Choice7=@'PlayMode,endless;name,endless;screen,'..GetScreenInstructions() Choice7=@'PlayMode,endless;name,endless;screen,'..GetScreenInstructions()
stepmania/src/ScreenSelectGroup.cpp
+1 -6
View File
@@ -31,12 +31,7 @@ void ScreenSelectGroup::Init()
{ {
ScreenWithMenuElements::Init(); ScreenWithMenuElements::Init();
if( !PREFSMAN->m_bShowSelectGroup ) ASSERT( PREFSMAN->m_bShowSelectGroup );
{
GAMESTATE->m_sPreferredSongGroup.Set( GROUP_ALL );
PostScreenMessage( SM_GoToNextScreen, 0 );
return;
}
vector<Song*> aAllSongs; vector<Song*> aAllSongs;
SONGMAN->GetSongs( aAllSongs ); SONGMAN->GetSongs( aAllSongs );