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

fix up failed transition timing

Browse Source
This commit is contained in:
Glenn Maynard
2007-05-01 19:43:41 +00:00
parent 79fefa5065
commit 0146246b94
3 changed files with 43 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/Themes/default/metrics.ini
+2 -1
View File
@@ -795,12 +795,13 @@ FailAfter30Misses=false
GivingUpGoesToPrevScreen=false
GivingUpGoesToNextScreen=false
InitialBackgroundBrightness=1
MusicFadeOutSeconds=0.5
MinSecondsToStep=6.0
MinSecondsToMusic=1.0
MinSecondsToStepNextSong=2.0
MusicFadeOutSeconds=0.5
OutTransitionLength=1.5
CourseTransitionLength=0.5
BeginFailedDelay=1.0
AllowCenter1Player=true
ScoreKeeperClass="ScoreKeeperNormal"
SongBackgroundOnCommand=
stepmania/src/ScreenGameplay.cpp
+40 -40
View File
@@ -338,6 +338,7 @@ void ScreenGameplay::Init()
MUSIC_FADE_OUT_SECONDS.Load( m_sName, "MusicFadeOutSeconds" );
OUT_TRANSITION_LENGTH.Load( m_sName, "OutTransitionLength" );
COURSE_TRANSITION_LENGTH.Load( m_sName, "CourseTransitionLength" );
BEGIN_FAILED_DELAY.Load( m_sName, "BeginFailedDelay" );
MIN_SECONDS_TO_STEP.Load( m_sName, "MinSecondsToStep" );
MIN_SECONDS_TO_MUSIC.Load( m_sName, "MinSecondsToMusic" );
MIN_SECONDS_TO_STEP_NEXT_SONG.Load( m_sName, "MinSecondsToStepNextSong" );
@@ -478,11 +479,6 @@ void ScreenGameplay::Init()
m_NextSong.SetDrawOrder( DRAW_ORDER_TRANSITIONS-1 );
this->AddChild( &m_NextSong );
m_SongFinished.SetDrawOrder( DRAW_ORDER_TRANSITIONS-1 );
m_SongFinished.Load( THEME->GetPathB(m_sName,"song finished") );
this->AddChild( &m_SongFinished );
bool bBattery = GAMESTATE->m_SongOptions.GetStage().m_LifeType==SongOptions::LIFE_BATTERY;
//
@@ -1092,8 +1088,6 @@ void ScreenGameplay::LoadNextSong()
m_LyricDisplay.PlayCommand( bAllReverse? "SetReverse": bAtLeastOneReverse? "SetOneReverse": "SetNoReverse" );
m_SongFinished.Reset();
// Load lyrics
// XXX: don't load this here
LyricsLoader LL;
@@ -1612,7 +1606,10 @@ void ScreenGameplay::Update( float fDeltaTime )
}
if( bAllFailed )
SCREENMAN->PostMessageToTopScreen( SM_BeginFailed, 0 );
{
m_pSoundMusic->StopPlaying();
SCREENMAN->PostMessageToTopScreen( SM_NotesEnded, 0 );
}
//
// Update living players' alive time
@@ -1644,8 +1641,13 @@ void ScreenGameplay::Update( float fDeltaTime )
{
float fSecondsToStartFadingOutMusic, fSecondsToStartTransitioningOut;
GetMusicEndTiming( fSecondsToStartFadingOutMusic, fSecondsToStartTransitioningOut );
if( GAMESTATE->m_fMusicSeconds >= fSecondsToStartTransitioningOut && !m_SongFinished.IsTransitioning() && !m_NextSong.IsTransitioning() )
m_SongFinished.StartTransitioning( SM_NotesEnded );
bool bAllReallyFailed = STATSMAN->m_CurStageStats.AllFailed();
if( bAllReallyFailed )
fSecondsToStartTransitioningOut += BEGIN_FAILED_DELAY;
if( GAMESTATE->m_fMusicSeconds >= fSecondsToStartTransitioningOut && !m_NextSong.IsTransitioning() )
this->PostScreenMessage( SM_NotesEnded, 0 );
}
//
@@ -1712,6 +1714,34 @@ void ScreenGameplay::Update( float fDeltaTime )
}
}
//
// update give up
//
bool bGiveUpTimerFired = !m_GiveUpTimer.IsZero() && m_GiveUpTimer.Ago() > 2.5f;
bool bAllHumanHaveComboOf30OrMoreMisses = STATSMAN->m_CurStageStats.AllHumanHaveComboOf30OrMoreMisses();
if( bGiveUpTimerFired || (FAIL_AFTER_30_MISSES && bAllHumanHaveComboOf30OrMoreMisses) )
{
STATSMAN->m_CurStageStats.m_bGaveUp = true;
FOREACH_EnabledPlayerNumberInfo( m_vPlayerInfo, pi )
{
pi->GetPlayerStageStats()->m_bFailed |= bAllHumanHaveComboOf30OrMoreMisses;
pi->GetPlayerStageStats()->m_bDisqualified = true;
}
AbortGiveUp( false );
if( GIVING_UP_GOES_TO_PREV_SCREEN )
{
BeginBackingOutFromGameplay();
}
else
{
m_pSoundMusic->StopPlaying();
this->PostScreenMessage( SM_NotesEnded, 0 );
}
return;
}
//
// Check to see if it's time to play a ScreenGameplay comment
//
@@ -1739,35 +1769,6 @@ void ScreenGameplay::Update( float fDeltaTime )
}
}
//
// update give up
//
bool bGiveUpTimerFired = !m_GiveUpTimer.IsZero() && m_GiveUpTimer.Ago() > 2.5f;
bool bAllHumanHaveComboOf30OrMoreMisses = STATSMAN->m_CurStageStats.AllHumanHaveComboOf30OrMoreMisses();
if( bGiveUpTimerFired || (FAIL_AFTER_30_MISSES && bAllHumanHaveComboOf30OrMoreMisses) )
{
// Give up
STATSMAN->m_CurStageStats.m_bGaveUp = true;
FOREACH_EnabledPlayerNumberInfo( m_vPlayerInfo, pi )
{
pi->GetPlayerStageStats()->m_bFailed |= bAllHumanHaveComboOf30OrMoreMisses;
pi->GetPlayerStageStats()->m_bDisqualified = true;
}
AbortGiveUp( false );
if( GIVING_UP_GOES_TO_PREV_SCREEN )
{
BeginBackingOutFromGameplay();
}
else
{
this->PostScreenMessage( SM_NotesEnded, 0 );
}
return;
}
PlayTicks();
UpdateLights();
@@ -2526,7 +2527,6 @@ void ScreenGameplay::HandleScreenMessage( const ScreenMessage SM )
{
m_DancingState = STATE_OUTRO;
AbortGiveUp( false );
m_pSoundMusic->StopPlaying();
m_GameplayAssist.StopPlaying(); /* Stop any queued assist ticks. */
TweenOffScreen();
m_Failed.StartTransitioning( SM_DoNextScreen );
stepmania/src/ScreenGameplay.h
+1 -1
View File
@@ -139,6 +139,7 @@ protected:
ThemeMetric<float> MUSIC_FADE_OUT_SECONDS;
ThemeMetric<float> OUT_TRANSITION_LENGTH;
ThemeMetric<float> COURSE_TRANSITION_LENGTH;
ThemeMetric<float> BEGIN_FAILED_DELAY;
ThemeMetric<float> MIN_SECONDS_TO_STEP;
ThemeMetric<float> MIN_SECONDS_TO_MUSIC;
ThemeMetric<float> MIN_SECONDS_TO_STEP_NEXT_SONG;
@@ -192,7 +193,6 @@ protected:
Foreground *m_pSongForeground;
Transition m_NextSong; // shows between songs in a course
Transition m_SongFinished; // shows after each song, course or not
AutoActor m_sprLifeFrame;
CombinedLifeMeter* m_pCombinedLifeMeter;