Fix compiler warnings.

This commit is contained in:
Steve Checkoway
2003-08-10 03:23:17 +00:00
parent 2a2bdb3cb5
commit 762afe38a4
9 changed files with 12 additions and 12 deletions
+1 -1
View File
@@ -42,7 +42,7 @@ void OptionIcon::Load( PlayerNumber pn, CString sText, bool bHeader )
{ {
static CString sStopWords[] = { "OFF", "VISIBLE", "VIVID", "STANDARD", "X1", "HOLDS", "DEFAULT", "OVERHEAD" }; static CString sStopWords[] = { "OFF", "VISIBLE", "VIVID", "STANDARD", "X1", "HOLDS", "DEFAULT", "OVERHEAD" };
for( int i=0; i<ARRAYSIZE(sStopWords); i++ ) for( unsigned i=0; i<ARRAYSIZE(sStopWords); i++ )
if( 0==stricmp(sText,sStopWords[i]) ) if( 0==stricmp(sText,sStopWords[i]) )
sText = ""; sText = "";
+1 -1
View File
@@ -84,7 +84,7 @@ void ScreenSongOptions::ImportOptions()
m_iSelectedOption[0][SO_AUTOSYNC] = so.m_bAutoSync; m_iSelectedOption[0][SO_AUTOSYNC] = so.m_bAutoSync;
m_iSelectedOption[0][SO_RATE] = 7; // in case we don't match below m_iSelectedOption[0][SO_RATE] = 7; // in case we don't match below
for( int i=0; i<g_SongOptionsLines[SO_RATE].choices.size(); i++ ) for( unsigned i=0; i<g_SongOptionsLines[SO_RATE].choices.size(); i++ )
if( so.m_fMusicRate == atof(g_SongOptionsLines[SO_RATE].choices[i]) ) if( so.m_fMusicRate == atof(g_SongOptionsLines[SO_RATE].choices[i]) )
m_iSelectedOption[0][SO_RATE] = i; m_iSelectedOption[0][SO_RATE] = i;
} }
+3 -3
View File
@@ -42,7 +42,7 @@ ScreenUnlock::ScreenUnlock() : ScreenAttract("ScreenUnlock")
{ {
LOG->Trace("ScreenUnlock::ScreenUnlock()"); LOG->Trace("ScreenUnlock::ScreenUnlock()");
int NumUnlocks = NUM_UNLOCKS; unsigned NumUnlocks = NUM_UNLOCKS;
if (GAMESTATE->m_pUnlockingSys->m_SongEntries.size() < NumUnlocks) if (GAMESTATE->m_pUnlockingSys->m_SongEntries.size() < NumUnlocks)
NumUnlocks = GAMESTATE->m_pUnlockingSys->m_SongEntries.size(); NumUnlocks = GAMESTATE->m_pUnlockingSys->m_SongEntries.size();
@@ -55,7 +55,7 @@ ScreenUnlock::ScreenUnlock() : ScreenAttract("ScreenUnlock")
PointsUntilNextUnlock.LoadFromFont( THEME->GetPathToF("Common normal") ); PointsUntilNextUnlock.LoadFromFont( THEME->GetPathToF("Common normal") );
PointsUntilNextUnlock.SetHorizAlign( Actor::align_left ); PointsUntilNextUnlock.SetHorizAlign( Actor::align_left );
int i; unsigned i;
CString IconCommand = ICON_COMMAND; CString IconCommand = ICON_COMMAND;
for(i=1; i <= NumUnlocks; i++) for(i=1; i <= NumUnlocks; i++)
{ {
@@ -235,7 +235,7 @@ ScreenUnlock::ScreenUnlock() : ScreenAttract("ScreenUnlock")
for(i=1; i <= UNLOCK_TEXT_SCROLL_ROWS; i++) for(i=1; i <= UNLOCK_TEXT_SCROLL_ROWS; i++)
{ {
if (i > (int) LastUnlocks.size()) if (i > LastUnlocks.size())
continue; continue;
unsigned NextIcon = LastUnlocks[LastUnlocks.size() - i]; unsigned NextIcon = LastUnlocks[LastUnlocks.size() - i];