From 14d12df8e049577f659bd6134dd971d18fef4917 Mon Sep 17 00:00:00 2001 From: Glenn Maynard Date: Sun, 7 Sep 2003 22:48:25 +0000 Subject: [PATCH] Fix warnings. --- stepmania/src/MusicBannerWheel.cpp | 2 +- stepmania/src/NoteDataUtil.cpp | 2 +- stepmania/src/ScreenEdit.cpp | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/stepmania/src/MusicBannerWheel.cpp b/stepmania/src/MusicBannerWheel.cpp index 5d3536b61f..277c39b55c 100644 --- a/stepmania/src/MusicBannerWheel.cpp +++ b/stepmania/src/MusicBannerWheel.cpp @@ -292,7 +292,7 @@ void MusicBannerWheel::ScanToNextGroup() localPos++; while(localPos != startingPos) { - if(localPos >= arraySongs.size()-1) + if(localPos >= (int) arraySongs.size()-1) { localPos = 0; } diff --git a/stepmania/src/NoteDataUtil.cpp b/stepmania/src/NoteDataUtil.cpp index 5fa8c9738f..d5e3b878b1 100644 --- a/stepmania/src/NoteDataUtil.cpp +++ b/stepmania/src/NoteDataUtil.cpp @@ -997,7 +997,7 @@ void NoteDataUtil::Scale( NoteData &nd, float fScale ) { temp.SetTapNote( t, r, TAP_EMPTY ); - int new_row = r*fScale; + int new_row = int(r*fScale); nd.SetTapNote( t, new_row, tn ); } } diff --git a/stepmania/src/ScreenEdit.cpp b/stepmania/src/ScreenEdit.cpp index d54e8a0b92..61d39ed3db 100644 --- a/stepmania/src/ScreenEdit.cpp +++ b/stepmania/src/ScreenEdit.cpp @@ -1546,7 +1546,7 @@ void ScreenEdit::HandleAreaMenuChoice( AreaMenuChoice c, int* iAnswers ) default: ASSERT(0); } - float fOldClipboardEndBeat = m_NoteFieldEdit.m_fEndMarker; +// float fOldClipboardEndBeat = m_NoteFieldEdit.m_fEndMarker; float fOldClipboardBeats = m_NoteFieldEdit.m_fEndMarker - m_NoteFieldEdit.m_fBeginMarker; float fNewClipboardBeats = fOldClipboardBeats * fScale; float fDeltaBeats = fNewClipboardBeats - fOldClipboardBeats;