From 311387c7953aadcc2a281eec72ff74ee12dec464 Mon Sep 17 00:00:00 2001 From: Glenn Maynard Date: Mon, 26 Feb 2007 00:53:27 +0000 Subject: [PATCH] unused return value --- stepmania/src/ScreenGameplay.cpp | 7 ++----- stepmania/src/ScreenGameplay.h | 2 +- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/stepmania/src/ScreenGameplay.cpp b/stepmania/src/ScreenGameplay.cpp index da3e83b60b..cd0ef57f26 100644 --- a/stepmania/src/ScreenGameplay.cpp +++ b/stepmania/src/ScreenGameplay.cpp @@ -1290,7 +1290,7 @@ void ScreenGameplay::LoadLights() NoteDataUtil::LoadTransformedLights( TapNoteData1, m_CabinetLightsNoteData, GameManager::StepsTypeToNumTracks(STEPS_TYPE_LIGHTS_CABINET) ); } -float ScreenGameplay::StartPlayingSong( float fMinTimeToNotes, float fMinTimeToMusic ) +void ScreenGameplay::StartPlayingSong( float fMinTimeToNotes, float fMinTimeToMusic ) { ASSERT( fMinTimeToNotes >= 0 ); ASSERT( fMinTimeToMusic >= 0 ); @@ -1318,9 +1318,6 @@ float ScreenGameplay::StartPlayingSong( float fMinTimeToNotes, float fMinTimeToM UpdateSongPosition(0); ASSERT( GAMESTATE->m_fMusicSeconds > -4000 ); /* make sure the "fake timer" code doesn't trigger */ - - /* Return the amount of time until the first beat. */ - return fFirstSecond - fStartSecond; } @@ -1450,7 +1447,7 @@ void ScreenGameplay::BeginScreen() * a bit of space at the beginning of the music with no steps. */ - /*float delay =*/ StartPlayingSong( fMinTimeToNotes, fMinTimeToMusic ); + StartPlayingSong( fMinTimeToNotes, fMinTimeToMusic ); } } diff --git a/stepmania/src/ScreenGameplay.h b/stepmania/src/ScreenGameplay.h index a75182ba05..c65feb2b5d 100644 --- a/stepmania/src/ScreenGameplay.h +++ b/stepmania/src/ScreenGameplay.h @@ -151,7 +151,7 @@ protected: void ReloadCurrentSong(); virtual void LoadNextSong(); void LoadCourseSongNumber( int iSongNumber ); - float StartPlayingSong( float MinTimeToNotes, float fMinTimeToMusic ); + void StartPlayingSong( float fMinTimeToNotes, float fMinTimeToMusic ); void LoadLights(); void PauseGame( bool bPause, GameController gc = GameController_Invalid ); void PlayAnnouncer( RString type, float fSeconds );