From 1eac0a3fa9c0d63bceb532d3fea481b0bf5fd3c1 Mon Sep 17 00:00:00 2001
From: Glenn Maynard <gmaynard@users.sourceforge.net>
Date: Mon, 1 Nov 2004 11:02:54 +0000
Subject: [PATCH] fix warnings

---
 stepmania/src/NoteDataUtil.cpp   | 2 +-
 stepmania/src/NotesLoaderBMS.cpp | 2 +-
 stepmania/src/RageUtil.h         | 5 +++++
 3 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/stepmania/src/NoteDataUtil.cpp b/stepmania/src/NoteDataUtil.cpp
index bf4183f834..2461b7d096 100644
--- a/stepmania/src/NoteDataUtil.cpp
+++ b/stepmania/src/NoteDataUtil.cpp
@@ -880,7 +880,7 @@ void NoteDataUtil::Wide( NoteData &inout, float fStartBeat, float fEndBeat )
 	inout.ConvertHoldNotesTo4s();
 
 	/* Start on an even beat. */
-	fStartBeat = Quantize( fStartBeat, 2 );
+	fStartBeat = Quantize( fStartBeat, 2.0f );
 
 	const int first_row = BeatToNoteRow( fStartBeat );
 	const int last_row = min( BeatToNoteRow(fEndBeat), inout.GetLastRow() );
diff --git a/stepmania/src/NotesLoaderBMS.cpp b/stepmania/src/NotesLoaderBMS.cpp
index 27160a787c..2189c93602 100644
--- a/stepmania/src/NotesLoaderBMS.cpp
+++ b/stepmania/src/NotesLoaderBMS.cpp
@@ -333,7 +333,7 @@ bool BMSLoader::LoadFromBMSFile( const CString &sPath, Steps &out, const map<CSt
 
 					// some BMS files seem to have funky alignment, causing us to write gigantic cache files.
 					// Try to correct for this by quantizing.
-					row = int(Quantize( float(row), ROWS_PER_MEASURE/64 ));
+					row = Quantize( row, ROWS_PER_MEASURE/64 );
 						
 					BmsTrack bmsTrack;
 					bool bIsHold;
diff --git a/stepmania/src/RageUtil.h b/stepmania/src/RageUtil.h
index 5b56280416..eaa1fcdd7a 100644
--- a/stepmania/src/RageUtil.h
+++ b/stepmania/src/RageUtil.h
@@ -156,6 +156,11 @@ inline float Quantize( const float f, const float fRoundInterval )
 	return int( (f + fRoundInterval/2)/fRoundInterval ) * fRoundInterval;
 }
 
+inline int Quantize( const int i, const int iRoundInterval )
+{
+	return int( (i + iRoundInterval/2)/iRoundInterval ) * iRoundInterval;
+}
+
 /* return f truncated to the nearest multiple of fTruncInterval */
 inline float ftruncf( const float f, const float fTruncInterval )
 {