fix warnings

This commit is contained in:
Glenn Maynard
2003-05-29 08:28:53 +00:00
parent 854d596f22
commit 18cb26908a
2 changed files with 5 additions and 5 deletions
+3 -3
View File
@@ -76,11 +76,11 @@ ScreenAutoGraphicDetail::ScreenAutoGraphicDetail() : Screen("ScreenAutoGraphicDe
float fSongBPM = SONG_BPM;
float fSongBPS = fSongBPM / 60.f;
int iBeatsToPlay = fSongBPS * SECONDS_TO_SHOW;
int iBeatsToPlay = int(fSongBPS * SECONDS_TO_SHOW);
for( int i=0; i<iBeatsToPlay; i++ )
{
float fBeat = i+2;
float fBeat = float(i)+2;
int iTrack = i % iNumOfTracks;
bool bIsHold = ((i / iNumOfTracks) % 2) == 1;
if( bIsHold )
@@ -105,7 +105,7 @@ ScreenAutoGraphicDetail::ScreenAutoGraphicDetail() : Screen("ScreenAutoGraphicDe
GAMESTATE->m_PlayerController[p] = PC_AUTOPLAY;
m_Player[p].Load( (PlayerNumber)p, pND, NULL, NULL, NULL, NULL );
m_Player[p].SetX( GAMESTATE->GetCurrentStyleDef()->m_iCenterX[p] );
m_Player[p].SetX( (float) GAMESTATE->GetCurrentStyleDef()->m_iCenterX[p] );
this->AddChild( &m_Player[p] );
}
+2 -2
View File
@@ -142,8 +142,8 @@ public:
float m_fMusicSampleStartSeconds;
float m_fMusicSampleLengthSeconds;
enum { DISPLAY_ACTUAL, DISPLAY_SPECIFIED, DISPLAY_RANDOM } m_DisplayBPMType;
int m_fDisplayBPMMin;
int m_fDisplayBPMMax; // if a range, then Min != Max
float m_fDisplayBPMMin;
float m_fDisplayBPMMax; // if a range, then Min != Max
float GetMusicStartBeat() const;