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

cleanup

Browse Source
This commit is contained in:
Chris Danford
2005-03-21 20:14:08 +00:00
parent a976f65a08
commit ea59bbfec8
2 changed files with 25 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/ScreenEvaluation.cpp
+25 -26
View File
@@ -84,6 +84,7 @@ const char* STATS_STRING[NUM_STATS_LINES] =
static const int NUM_SHOWN_RADAR_CATEGORIES = 5; static const int NUM_SHOWN_RADAR_CATEGORIES = 5;
const ScreenMessage SM_PlayCheer = ScreenMessage(SM_User+6); const ScreenMessage SM_PlayCheer = ScreenMessage(SM_User+6);
const ScreenMessage SM_AddBonus = ScreenMessage(SM_User+7);
REGISTER_SCREEN_CLASS( ScreenEvaluation ); REGISTER_SCREEN_CLASS( ScreenEvaluation );
@@ -859,8 +860,9 @@ void ScreenEvaluation::Init()
SOUND->PlayMusic( THEME->GetPathS(m_sName,"music") ); SOUND->PlayMusic( THEME->GetPathS(m_sName,"music") );
m_timerSoundSequences.SetZero(); // zero the sound sequence timer m_timerSoundSequences.SetZero(); // zero the sound sequence timer
m_timerSoundSequences.Touch(); // set the timer going :] m_timerSoundSequences.Touch(); // set the timer going :]
m_fScreenCreateTime = RageTimer::GetTimeSinceStart();
} this->PostScreenMessage( SM_AddBonus, 1.5f );
}
void ScreenEvaluation::CommitScores( void ScreenEvaluation::CommitScores(
@@ -1290,30 +1292,6 @@ void ScreenEvaluation::Update( float fDeltaTime )
} }
} }
} }
FOREACH_EnabledPlayer( p )
{
if( STATSMAN->m_CurStageStats.m_player[p].iBonus == 0 )
continue;
if( GAMESTATE->IsCourseMode() )
continue;
// wait a few seconds before adding bonus
if( RageTimer::GetTimeSinceStart() - m_fScreenCreateTime < 1.5f )
continue;
int increment = STATSMAN->m_CurStageStats.m_player[p].iBonus/10;
/* XXX: What's this supposed to do? If i < 1, then min(i, 1024) is i ... */
if( increment < 1 )
increment = min( 1024, STATSMAN->m_CurStageStats.m_player[p].iBonus );
STATSMAN->m_CurStageStats.m_player[p].iBonus -= increment;
STATSMAN->m_CurStageStats.m_player[p].iScore += increment;
if( SHOW_SCORE_AREA )
m_textScore[p].SetText( ssprintf("%*.0i", NUM_SCORE_DIGITS, STATSMAN->m_CurStageStats.m_player[p].iScore) );
}
} }
void ScreenEvaluation::DrawPrimitives() void ScreenEvaluation::DrawPrimitives()
@@ -1423,6 +1401,27 @@ void ScreenEvaluation::HandleScreenMessage( const ScreenMessage SM )
case SM_PlayCheer: case SM_PlayCheer:
SOUND->PlayOnceFromDir( ANNOUNCER->GetPathTo("evaluation cheer") ); SOUND->PlayOnceFromDir( ANNOUNCER->GetPathTo("evaluation cheer") );
break; break;
case SM_AddBonus:
FOREACH_EnabledPlayer( p )
{
if( STATSMAN->m_CurStageStats.m_player[p].iBonus == 0 )
continue;
if( GAMESTATE->IsCourseMode() )
continue;
int increment = STATSMAN->m_CurStageStats.m_player[p].iBonus/10;
/* XXX: What's this supposed to do? If i < 1, then min(i, 1024) is i ... */
if( increment < 1 )
increment = min( 1024, STATSMAN->m_CurStageStats.m_player[p].iBonus );
STATSMAN->m_CurStageStats.m_player[p].iBonus -= increment;
STATSMAN->m_CurStageStats.m_player[p].iScore += increment;
if( SHOW_SCORE_AREA )
m_textScore[p].SetText( ssprintf("%*.0i", NUM_SCORE_DIGITS, STATSMAN->m_CurStageStats.m_player[p].iScore) );
}
break;
} }
} }
stepmania/src/ScreenEvaluation.h
-2
View File
@@ -60,8 +60,6 @@ protected:
Type m_Type; Type m_Type;
float m_fScreenCreateTime;
// banner area // banner area
Banner m_LargeBanner; Banner m_LargeBanner;
AutoActor m_sprLargeBannerFrame; AutoActor m_sprLargeBannerFrame;