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

split UpdateLights() from monster ScreenGameplay::Update()

Browse Source
This commit is contained in:
Glenn Maynard
2004-12-03 23:30:50 +00:00
parent 5f0f8a6d28
commit 2b3e145a30
2 changed files with 29 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/ScreenGameplay.cpp
+28 -24
View File
@@ -1509,6 +1509,34 @@ void ScreenGameplay::Update( float fDeltaTime )
//
// update lights
//
UpdateLights();
//
// update song position meter
//
// IMHHO, The song position bar is best used to represent where in the
// step sequence the players are. It looks "better" that way, showing a
// song "depleting" as the players wear on. So, it starts "ticking" at
// the first arrow and winds down to the very end.
float fPercentPositionSong = SCALE( GAMESTATE->m_fMusicSeconds, m_fSongPosMeterOffset,
m_fSongPosMeterEnd, 0.0f, 1.0f );
CLAMP( fPercentPositionSong, 0, 1 );
m_meterSongPosition.SetPercent( fPercentPositionSong );
if( NSMAN->useSMserver )
{
FOREACH_EnabledPlayer( pn2 )
if( m_pLifeMeter[pn2] )
NSMAN->m_playerLife[pn2] = int(m_pLifeMeter[pn2]->GetLife()*10000);
FOREACH_NSScoreBoardColumn(cn)
if( m_ShowScoreboard && NSMAN->ChangedScoreboard(cn) )
m_Scoreboard[cn].SetText( NSMAN->m_Scoreboard[cn] );
}
}
void ScreenGameplay::UpdateLights()
{
const Style* pStyle = GAMESTATE->GetCurrentStyle();
bool bBlinkCabinetLight[NUM_CABINET_LIGHTS];
bool bBlinkGameButton[MAX_GAME_CONTROLLERS][MAX_GAME_BUTTONS];
@@ -1609,30 +1637,6 @@ void ScreenGameplay::Update( float fDeltaTime )
LIGHTSMAN->BlinkGameButton( GameInput(gc,gb) );
}
}
//
// update song position meter
//
// IMHHO, The song position bar is best used to represent where in the
// step sequence the players are. It looks "better" that way, showing a
// song "depleting" as the players wear on. So, it starts "ticking" at
// the first arrow and winds down to the very end.
float fPercentPositionSong = SCALE( GAMESTATE->m_fMusicSeconds, m_fSongPosMeterOffset,
m_fSongPosMeterEnd, 0.0f, 1.0f );
CLAMP( fPercentPositionSong, 0, 1 );
m_meterSongPosition.SetPercent( fPercentPositionSong );
if( NSMAN->useSMserver )
{
FOREACH_EnabledPlayer( pn2 )
if( m_pLifeMeter[pn2] )
NSMAN->m_playerLife[pn2] = int(m_pLifeMeter[pn2]->GetLife()*10000);
FOREACH_NSScoreBoardColumn(cn)
if( m_ShowScoreboard && NSMAN->ChangedScoreboard(cn) )
m_Scoreboard[cn].SetText( NSMAN->m_Scoreboard[cn] );
}
}
void ScreenGameplay::AbortGiveUp()
stepmania/src/ScreenGameplay.h
+1
View File
@@ -76,6 +76,7 @@ protected:
float StartPlayingSong(float MinTimeToNotes, float MinTimeToMusic);
void ShowSavePrompt( ScreenMessage SM_SendWhenDone );
void PlayAnnouncer( CString type, float fSeconds );
void UpdateLights();
void PlayTicks();
void UpdateSongPosition( float fDeltaTime );