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

use GAMESTATE->m_fLightSongBeat

Browse Source
This commit is contained in:
Glenn Maynard
2005-05-04 20:37:41 +00:00
parent 16fd7077bb
commit 0cbcd2ffab
2 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/LightsManager.cpp
+3 -3
View File
@@ -137,7 +137,7 @@ void LightsManager::Update( float fDeltaTime )
{ {
case LIGHTSMODE_JOINING: case LIGHTSMODE_JOINING:
{ {
// int iBeat = (int)(GAMESTATE->m_fSongBeat); // int iBeat = (int)(GAMESTATE->m_fLightSongBeat);
// bool bBlinkOn = (iBeat%2)==0; // bool bBlinkOn = (iBeat%2)==0;
FOREACH_PlayerNumber( pn ) FOREACH_PlayerNumber( pn )
@@ -175,7 +175,7 @@ void LightsManager::Update( float fDeltaTime )
FOREACH_CabinetLight( cl ) FOREACH_CabinetLight( cl )
m_LightsState.m_bCabinetLights[cl] = false; m_LightsState.m_bCabinetLights[cl] = false;
int iBeat = (int)(GAMESTATE->m_fSongBeat); int iBeat = (int)(GAMESTATE->m_fLightSongBeat);
int iTopIndex = iBeat; int iTopIndex = iBeat;
wrap( iTopIndex, 4 ); wrap( iTopIndex, 4 );
switch( iTopIndex ) switch( iTopIndex )
@@ -238,7 +238,7 @@ void LightsManager::Update( float fDeltaTime )
// If not joined, has enough credits, and not too late to join, then // If not joined, has enough credits, and not too late to join, then
// blink the menu buttons rapidly so they'll press Start // blink the menu buttons rapidly so they'll press Start
{ {
int iBeat = (int)(GAMESTATE->m_fSongBeat*4); int iBeat = (int)(GAMESTATE->m_fLightSongBeat*4);
bool bBlinkOn = (iBeat%2)==0; bool bBlinkOn = (iBeat%2)==0;
FOREACH_PlayerNumber( pn ) FOREACH_PlayerNumber( pn )
{ {
stepmania/src/ScreenGameplay.cpp
+1 -2
View File
@@ -1650,8 +1650,7 @@ void ScreenGameplay::UpdateLights()
ZERO( bBlinkGameButton ); ZERO( bBlinkGameButton );
bool bCrossedABeat = false; bool bCrossedABeat = false;
{ {
float fPositionSeconds = GAMESTATE->m_fMusicSeconds + g_fLightsAheadSeconds; // trigger the light a tiny bit early const float fSongBeat = GAMESTATE->m_fLightSongBeat;
float fSongBeat = GAMESTATE->m_pCurSong->GetBeatFromElapsedTime( fPositionSeconds );
const int iSongRow = BeatToNoteRowNotRounded( fSongBeat ); const int iSongRow = BeatToNoteRowNotRounded( fSongBeat );
static int iRowLastCrossed = 0; static int iRowLastCrossed = 0;