diff --git a/stepmania/src/BGAnimation.cpp b/stepmania/src/BGAnimation.cpp index 4649df0e50..d85566a980 100644 --- a/stepmania/src/BGAnimation.cpp +++ b/stepmania/src/BGAnimation.cpp @@ -65,7 +65,7 @@ void BGAnimation::LoadFromAniDir( CString sAniDir ) IniFile ini(sPathToIni); ini.ReadFile(); - unsigned i; + int i; for( i=0; iGetMaxTweenTimeLeft()); } } diff --git a/stepmania/src/GameState.cpp b/stepmania/src/GameState.cpp index e081218a0d..c5e96a9874 100644 --- a/stepmania/src/GameState.cpp +++ b/stepmania/src/GameState.cpp @@ -128,7 +128,7 @@ void GameState::Update( float fDelta ) m_bActiveAttackEndedThisUpdate[p] = false; - for( unsigned s=0; s 0 ) { @@ -510,7 +510,7 @@ void GameState::LaunchAttack( PlayerNumber target, Attack a ) LOG->Trace( "Launch attack '%s' against P%d", a.sModifier.c_str(), target+1 ); // search for an open slot - for( unsigned s=0; s 0 ) iSum += m_ActiveAttacks[pn][s].level; diff --git a/stepmania/src/GroupList.cpp b/stepmania/src/GroupList.cpp index 7d7a1d0fd2..9dc39f6dbe 100644 --- a/stepmania/src/GroupList.cpp +++ b/stepmania/src/GroupList.cpp @@ -161,7 +161,7 @@ void GroupList::SetSelection( unsigned sel ) m_iSelection=sel; - if( m_asLabels.size() <= MAX_GROUPS_ONSCREEN || + if( (int)m_asLabels.size() <= MAX_GROUPS_ONSCREEN || sel <= MAX_GROUPS_ONSCREEN/2 ) m_iTop = 0; else if ( sel >= m_asLabels.size() - MAX_GROUPS_ONSCREEN/2 ) diff --git a/stepmania/src/InputMapper.cpp b/stepmania/src/InputMapper.cpp index 71db4ec766..df026e1576 100644 --- a/stepmania/src/InputMapper.cpp +++ b/stepmania/src/InputMapper.cpp @@ -186,7 +186,7 @@ void InputMapper::AutoMapJoysticksForCurrentGame() { InputDevice device = vDevices[i]; CString sDescription = vDescriptions[i]; - for( unsigned j=0; jTrace( "ScreenCredits::ScreenCredits()" ); - unsigned i; + int i; GAMESTATE->Reset(); // so that credits message for both players will show diff --git a/stepmania/src/ScreenEvaluation.cpp b/stepmania/src/ScreenEvaluation.cpp index 86f39f7fdb..98a49bacaf 100644 --- a/stepmania/src/ScreenEvaluation.cpp +++ b/stepmania/src/ScreenEvaluation.cpp @@ -150,6 +150,7 @@ ScreenEvaluation::ScreenEvaluation( CString sClassName, Type type ) : Screen(sCl break; case stage: case course: + LOG->Trace("We made it to stage"); stageStats = GAMESTATE->m_CurStageStats; break; default: @@ -752,7 +753,7 @@ void ScreenEvaluation::TweenOffScreen() } // small banner area - for( unsigned i=0; im_pUnlockingSys->m_SongEntries.size() ) + if ((unsigned)i <= GAMESTATE->m_pUnlockingSys->m_SongEntries.size() ) SongTitle = GAMESTATE->m_pUnlockingSys->m_SongEntries[i-1].m_sSongName; } @@ -127,7 +127,7 @@ ScreenUnlock::ScreenUnlock() : ScreenAttract("ScreenUnlock") CString DisplayedSong = DISPLAYED_SONG(i); if (USE_UNLOCKS_DAT == 1) { - if (i <= GAMESTATE->m_pUnlockingSys->m_SongEntries.size() ) + if ((unsigned)i <= GAMESTATE->m_pUnlockingSys->m_SongEntries.size() ) DisplayedSong = GAMESTATE->m_pUnlockingSys->m_SongEntries[i-1].m_sSongName; } @@ -249,7 +249,7 @@ ScreenUnlock::ScreenUnlock() : ScreenAttract("ScreenUnlock") if (i > (int) LastUnlocks.size()) continue; - int NextIcon = LastUnlocks[LastUnlocks.size() - i]; + unsigned NextIcon = LastUnlocks[LastUnlocks.size() - i]; Sprite* NewIcon = new Sprite; BitmapText* NewText = new BitmapText; diff --git a/stepmania/src/SongManager.cpp b/stepmania/src/SongManager.cpp index dc6e28bd6e..af58a65af8 100644 --- a/stepmania/src/SongManager.cpp +++ b/stepmania/src/SongManager.cpp @@ -281,7 +281,7 @@ void SongManager::ReadNoteScoresFromFile( CString fn, int c ) Difficulty dc; getline(f, line); - if( sscanf(line.c_str(), "%d %d", &nt, &dc) != 2 ) + if( sscanf(line.c_str(), "%d %d", (int *)&nt, (int *)&dc) != 2 ) break; CString sDescription; @@ -301,7 +301,7 @@ void SongManager::ReadNoteScoresFromFile( CString fn, int c ) int iNumTimesPlayed; Grade grade; int iScore; - if( sscanf(line.c_str(), "%d %d %i\n", &iNumTimesPlayed, &grade, &iScore) != 3 ) + if( sscanf(line.c_str(), "%d %d %i\n", &iNumTimesPlayed, (int *)&grade, &iScore) != 3 ) break; if( pNotes ) { @@ -530,7 +530,7 @@ void SongManager::SaveNoteScoresToFile( CString fn, int c ) fprintf(fp, "%s\n%u\n", pSong->GetSongDir().c_str(), - vNotes.size() ); + (unsigned)vNotes.size() ); for( unsigned i=0; i