This commit is contained in:
Glenn Maynard
2003-02-12 19:39:58 +00:00
parent caee0fc111
commit 8988dab6f7
5 changed files with 9 additions and 9 deletions
+1 -1
View File
@@ -385,7 +385,7 @@ void Background::Update( float fDeltaTime )
if( int(i) > m_iCurBGSegment ) if( int(i) > m_iCurBGSegment )
{ {
// printf( "%d, %d, %f, %f\n", m_iCurBGSegment, i, m_aBGSegments[i].m_fStartBeat, GAMESTATE->m_fSongBeat ); // LOG->Trace( "%d, %d, %f, %f\n", m_iCurBGSegment, i, m_aBGSegments[i].m_fStartBeat, GAMESTATE->m_fSongBeat );
BGAnimation* pOld = GetCurBGA(); BGAnimation* pOld = GetCurBGA();
m_iCurBGSegment = i; m_iCurBGSegment = i;
BGAnimation* pNew = GetCurBGA(); BGAnimation* pNew = GetCurBGA();
+2 -2
View File
@@ -111,7 +111,7 @@ void CourseContentsFrame::SetFromCourse( Course* pCourse )
if( pNotes == NULL ) if( pNotes == NULL )
continue; // skip continue; // skip
printf( "Adding song '%s'\n", pSong->m_sMainTitle.GetString() ); LOG->Trace( "Adding song '%s'\n", pSong->m_sMainTitle.GetString() );
m_CourseContentDisplays[m_iNumContents].Load( m_iNumContents+1, pSong, pNotes ); m_CourseContentDisplays[m_iNumContents].Load( m_iNumContents+1, pSong, pNotes );
m_CourseContentDisplays[m_iNumContents].SetXY( 0, -((MAX_VISIBLE_CONTENTS-1)/2) * float(ContentsBarHeight) ); m_CourseContentDisplays[m_iNumContents].SetXY( 0, -((MAX_VISIBLE_CONTENTS-1)/2) * float(ContentsBarHeight) );
m_CourseContentDisplays[m_iNumContents].StopTweening(); m_CourseContentDisplays[m_iNumContents].StopTweening();
@@ -120,7 +120,7 @@ void CourseContentsFrame::SetFromCourse( Course* pCourse )
m_iNumContents ++; m_iNumContents ++;
} }
printf( "m_iNumContents is %d\n", m_iNumContents ); LOG->Trace( "m_iNumContents is %d\n", m_iNumContents );
} }
void CourseContentsFrame::Update( float fDeltaTime ) void CourseContentsFrame::Update( float fDeltaTime )
+1 -1
View File
@@ -41,7 +41,7 @@ void HoldGhostArrow::Update( float fDeltaTime )
CLAMP( m_fHeatLevel, 0, 1 ); CLAMP( m_fHeatLevel, 0, 1 );
// if( m_fHeatLevel > 0 ) // if( m_fHeatLevel > 0 )
// printf( "m_fHeatLevel = %f\n", m_fHeatLevel ); // LOG->Trace( "m_fHeatLevel = %f\n", m_fHeatLevel );
int iStateNum = (int)min( m_fHeatLevel * GetNumStates(), GetNumStates()-1 ); int iStateNum = (int)min( m_fHeatLevel * GetNumStates(), GetNumStates()-1 );
SetState( iStateNum ); SetState( iStateNum );
+1 -1
View File
@@ -153,7 +153,7 @@ void LifeMeterBattery::OnDancePointsChange()
iPossibleDancePoints = max( 1, iPossibleDancePoints ); iPossibleDancePoints = max( 1, iPossibleDancePoints );
float fPercentDancePoints = iActualDancePoints / (float)iPossibleDancePoints + 0.00001f; // correct for rounding errors float fPercentDancePoints = iActualDancePoints / (float)iPossibleDancePoints + 0.00001f; // correct for rounding errors
// printf( "Actual %d, Possible %d, Percent %f\n", iActualDancePoints, iPossibleDancePoints, fPercentDancePoints ); // LOG->Trace( "Actual %d, Possible %d, Percent %f\n", iActualDancePoints, iPossibleDancePoints, fPercentDancePoints );
float fNumToDisplay = MAX( 0, fPercentDancePoints*100 ); float fNumToDisplay = MAX( 0, fPercentDancePoints*100 );
CString sNumToDisplay = ssprintf("%03.1f%%", fNumToDisplay); CString sNumToDisplay = ssprintf("%03.1f%%", fNumToDisplay);
+4 -4
View File
@@ -1239,13 +1239,13 @@ void ScreenEdit::InputActionMenu( const DeviceInput& DeviceI, const InputEventTy
case SDLK_UP: case SDLK_UP:
MenuItemLoseFocus( &m_textActionMenu[m_iMenuSelection] ); MenuItemLoseFocus( &m_textActionMenu[m_iMenuSelection] );
m_iMenuSelection = (m_iMenuSelection-1+NUM_ACTION_MENU_ITEMS) % NUM_ACTION_MENU_ITEMS; m_iMenuSelection = (m_iMenuSelection-1+NUM_ACTION_MENU_ITEMS) % NUM_ACTION_MENU_ITEMS;
printf( "%d\n", m_iMenuSelection ); LOG->Trace( "%d\n", m_iMenuSelection );
MenuItemGainFocus( &m_textActionMenu[m_iMenuSelection] ); MenuItemGainFocus( &m_textActionMenu[m_iMenuSelection] );
break; break;
case SDLK_DOWN: case SDLK_DOWN:
MenuItemLoseFocus( &m_textActionMenu[m_iMenuSelection] ); MenuItemLoseFocus( &m_textActionMenu[m_iMenuSelection] );
m_iMenuSelection = (m_iMenuSelection+1) % NUM_ACTION_MENU_ITEMS; m_iMenuSelection = (m_iMenuSelection+1) % NUM_ACTION_MENU_ITEMS;
printf( "%d\n", m_iMenuSelection ); LOG->Trace( "%d\n", m_iMenuSelection );
MenuItemGainFocus( &m_textActionMenu[m_iMenuSelection] ); MenuItemGainFocus( &m_textActionMenu[m_iMenuSelection] );
break; break;
case SDLK_RETURN: case SDLK_RETURN:
@@ -1324,13 +1324,13 @@ void ScreenEdit::InputNamingMenu( const DeviceInput& DeviceI, const InputEventTy
case SDLK_UP: case SDLK_UP:
MenuItemLoseFocus( &m_textNamingMenu[m_iMenuSelection] ); MenuItemLoseFocus( &m_textNamingMenu[m_iMenuSelection] );
m_iMenuSelection = (m_iMenuSelection-1+NUM_NAMING_MENU_ITEMS) % NUM_NAMING_MENU_ITEMS; m_iMenuSelection = (m_iMenuSelection-1+NUM_NAMING_MENU_ITEMS) % NUM_NAMING_MENU_ITEMS;
printf( "%d\n", m_iMenuSelection ); LOG->Trace( "%d\n", m_iMenuSelection );
MenuItemGainFocus( &m_textNamingMenu[m_iMenuSelection] ); MenuItemGainFocus( &m_textNamingMenu[m_iMenuSelection] );
break; break;
case SDLK_DOWN: case SDLK_DOWN:
MenuItemLoseFocus( &m_textNamingMenu[m_iMenuSelection] ); MenuItemLoseFocus( &m_textNamingMenu[m_iMenuSelection] );
m_iMenuSelection = (m_iMenuSelection+1) % NUM_NAMING_MENU_ITEMS; m_iMenuSelection = (m_iMenuSelection+1) % NUM_NAMING_MENU_ITEMS;
printf( "%d\n", m_iMenuSelection ); LOG->Trace( "%d\n", m_iMenuSelection );
MenuItemGainFocus( &m_textNamingMenu[m_iMenuSelection] ); MenuItemGainFocus( &m_textNamingMenu[m_iMenuSelection] );
break; break;
case SDLK_RETURN: case SDLK_RETURN: