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

move lyric updating into a separate function

Browse Source 
(trying to debug a crash; 6+ levels of indentation makes that hard)
This commit is contained in:
Glenn Maynard
2003-03-19 17:43:11 +00:00
parent 1876494374
commit 46c7457ab5
2 changed files with 54 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/ScreenGameplay.cpp
+53 -50
View File
@@ -774,6 +774,58 @@ bool ScreenGameplay::IsTimeToPlayTicks() const
return bAnyoneHasANote; return bAnyoneHasANote;
} }
void ScreenGameplay::UpdateLyrics( float fDeltaTime )
{
//
// Check if we should show lyrics now
//
if( !m_bHasLyrics )
return;
m_fLyricsTime += fDeltaTime;
float fStartTime = (GAMESTATE->m_pCurSong->m_LyricSegments[m_iCurLyricNumber].m_fStartTime);
// Make sure we don't go over the array's boundry
if( m_iCurLyricNumber <= GAMESTATE->m_pCurSong->m_LyricSegments.size() )
{
// Check if it's time to animate the old lyrics to off-screen
if( (fStartTime - m_fLyricsTime) <= .30 || (fStartTime - m_fLyricsTime) <= -.30f)
{
m_textLyrics.FadeOff( 0, "foldy", .20f);
}
if( m_fLyricsTime >= fStartTime )
{
/*I figure for longer lines of text, the Lyric display object should
be scaled down, if needed, by the .ScaleTo() function. But somehow
it jus ain't working for me at all.. anyone able to do this
properly?? We prolly should also add detection of where to put
the Lyric object, if the arrows are on reverse? Jus an idea,
but it kinda defeats the purpose of the Lyric object X/Y being a
theme element :)
BTW: Once the function is done, this will also be where the color
of this lyric block will be set -- Miryokuteki */
//m_textLyrics.SetDiffuse(COLOR HERE);
/*if( GAMESTATE->m_pCurSong->m_LyricSegments[m_iCurLyricNumber].m_sLyric == "" || GAMESTATE->m_pCurSong->m_LyricSegments[m_iCurLyricNumber].m_sLyric == " " )
{
For some reason, once this fades off, it never comes back when
it's called! -- Miryokuteki
m_textLyrics.FadeOff( 0, "fade", .10f );
m_iCurLyricNumber++;
}
else
{
*/
m_textLyrics.FadeOn( 0, "foldy", .20f );
m_textLyrics.SetText( GAMESTATE->m_pCurSong->m_LyricSegments[m_iCurLyricNumber].m_sLyric );
m_iCurLyricNumber++;
//}
}
}
}
void ScreenGameplay::Update( float fDeltaTime ) void ScreenGameplay::Update( float fDeltaTime )
{ {
@@ -841,56 +893,7 @@ void ScreenGameplay::Update( float fDeltaTime )
switch( m_DancingState ) switch( m_DancingState )
{ {
case STATE_DANCING: case STATE_DANCING:
UpdateLyrics(fDeltaTime);
//
// Check if we should show lyrics now
//
if( (m_bHasLyrics) ) // Every song without lyrics would crash here.. bug fix -- Miryokuteki
{
m_fLyricsTime += fDeltaTime;
float fStartTime = (GAMESTATE->m_pCurSong->m_LyricSegments[m_iCurLyricNumber].m_fStartTime);
// Make sure we don't go over the array's boundry
if( m_iCurLyricNumber <= GAMESTATE->m_pCurSong->m_LyricSegments.size() )
{
// Check if it's time to animate the old lyrics to off-screen
if( (fStartTime - m_fLyricsTime) <= .30 || (fStartTime - m_fLyricsTime) <= -.30f)
{
m_textLyrics.FadeOff( 0, "foldy", .20f);
}
if( m_fLyricsTime >= fStartTime )
{
/*I figure for longer lines of text, the Lyric display object should
be scaled down, if needed, by the .ScaleTo() function. But somehow
it jus ain't working for me at all.. anyone able to do this
properly?? We prolly should also add detection of where to put
the Lyric object, if the arrows are on reverse? Jus an idea,
but it kinda defeats the purpose of the Lyric object X/Y being a
theme element :)
BTW: Once the function is done, this will also be where the color
of this lyric block will be set -- Miryokuteki */
//m_textLyrics.SetDiffuse(COLOR HERE);
/*if( GAMESTATE->m_pCurSong->m_LyricSegments[m_iCurLyricNumber].m_sLyric == "" || GAMESTATE->m_pCurSong->m_LyricSegments[m_iCurLyricNumber].m_sLyric == " " )
{
For some reason, once this fades off, it never comes back when
it's called! -- Miryokuteki
m_textLyrics.FadeOff( 0, "fade", .10f );
m_iCurLyricNumber++;
}
else
{
*/
m_textLyrics.FadeOn( 0, "foldy", .20f );
m_textLyrics.SetText( GAMESTATE->m_pCurSong->m_LyricSegments[m_iCurLyricNumber].m_sLyric );
m_iCurLyricNumber++;
//}
}
}
}
// //
// Update players' alive time // Update players' alive time
stepmania/src/ScreenGameplay.h
+1
View File
@@ -75,6 +75,7 @@ protected:
bool AllAreFailing(); bool AllAreFailing();
bool AllFailedEarlier(); bool AllFailedEarlier();
bool IsTimeToPlayTicks() const; bool IsTimeToPlayTicks() const;
void UpdateLyrics( float fDeltaTime );
enum DancingState { enum DancingState {
STATE_INTRO = 0, // not allowed to press Back STATE_INTRO = 0, // not allowed to press Back