From 8c6ba0f506ee7cf436aeebb8b1087b6066ef0ab5 Mon Sep 17 00:00:00 2001 From: Steve Checkoway Date: Fri, 1 Aug 2003 12:12:02 +0000 Subject: [PATCH] Fix compile warnings --- stepmania/src/CodeDetector.cpp | 2 +- stepmania/src/Course.cpp | 2 +- stepmania/src/RageLog.cpp | 2 +- stepmania/src/RageSoundReader_Preload.cpp | 4 ++-- stepmania/src/ScreenCredits.cpp | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/stepmania/src/CodeDetector.cpp b/stepmania/src/CodeDetector.cpp index cc17b4aea2..3d1a2554f9 100644 --- a/stepmania/src/CodeDetector.cpp +++ b/stepmania/src/CodeDetector.cpp @@ -50,7 +50,7 @@ const CString g_sCodeNames[CodeDetector::NUM_CODES] = { "NextAnnouncer" }; -const int MAX_CODE_LENGTH = 10; +const unsigned MAX_CODE_LENGTH = 10; struct CodeCacheItem { int iNumButtons; diff --git a/stepmania/src/Course.cpp b/stepmania/src/Course.cpp index 1bb310410c..cde272cca5 100644 --- a/stepmania/src/Course.cpp +++ b/stepmania/src/Course.cpp @@ -515,7 +515,7 @@ void Course::GetCourseInfo( NotesType nt, vector &ci, int Difficul for( unsigned j=0; j sizeof(backlog[backlog_start])-1) len = sizeof(backlog[backlog_start])-1; diff --git a/stepmania/src/RageSoundReader_Preload.cpp b/stepmania/src/RageSoundReader_Preload.cpp index fd040c2fce..e81a7efff7 100644 --- a/stepmania/src/RageSoundReader_Preload.cpp +++ b/stepmania/src/RageSoundReader_Preload.cpp @@ -6,7 +6,7 @@ const int channels = 2; const int samplesize = 2 * channels; /* 16-bit */ /* If a sound is smaller than this, we'll load it entirely into memory. */ -const int max_prebuf_size = 1024*256; +const unsigned max_prebuf_size = 1024*256; int SoundReader_Preload::total_samples() const { @@ -24,7 +24,7 @@ bool SoundReader_Preload::Open(SoundReader *source) { float secs = len / 1000.f; - int pcmsize = int(secs * samplerate * samplesize); /* seconds -> bytes */ + unsigned pcmsize = unsigned(secs * samplerate * samplesize); /* seconds -> bytes */ if(pcmsize > max_prebuf_size) return false; /* Don't bother trying to preload it. */ diff --git a/stepmania/src/ScreenCredits.cpp b/stepmania/src/ScreenCredits.cpp index 02eff87b75..7a2dd0fb4d 100644 --- a/stepmania/src/ScreenCredits.cpp +++ b/stepmania/src/ScreenCredits.cpp @@ -207,7 +207,7 @@ ScreenCredits::ScreenCredits() : Screen("ScreenCredits") this->AddChild( &m_ScrollerFrames ); - for( i=0; iLoadFromFont( THEME->GetPathToF("ScreenCredits titles") );