Fix minor windows pedantic warnings.

This commit is contained in:
Jason Felds
2016-03-27 21:52:05 -04:00
parent 534909d30a
commit bec18a0d36
31 changed files with 173 additions and 67 deletions
+9 -2
View File
@@ -924,7 +924,7 @@ void NoteField::DrawPrimitives()
FOREACH_BackgroundLayer( j )
iter[j] = GAMESTATE->m_pCurSong->GetBackgroundChanges(j).begin();
while( 1 )
for(;;)
{
float fLowestBeat = FLT_MAX;
vector<BackgroundLayer> viLowestIndex;
@@ -932,8 +932,9 @@ void NoteField::DrawPrimitives()
FOREACH_BackgroundLayer( j )
{
if( iter[j] == GAMESTATE->m_pCurSong->GetBackgroundChanges(j).end() )
{
continue;
}
float fBeat = iter[j]->m_fStartBeat;
if( fBeat < fLowestBeat )
{
@@ -950,7 +951,9 @@ void NoteField::DrawPrimitives()
if( viLowestIndex.empty() )
{
FOREACH_BackgroundLayer( j )
{
ASSERT( iter[j] == GAMESTATE->m_pCurSong->GetBackgroundChanges(j).end() );
}
break;
}
@@ -963,13 +966,17 @@ void NoteField::DrawPrimitives()
const BackgroundChange& change = *iter[*bl];
RString s = change.GetTextDescription();
if( *bl!=0 )
{
s = ssprintf("%d: ",*bl) + s;
}
vsBGChanges.push_back( s );
}
DrawBGChangeText(fLowestBeat, join("\n",vsBGChanges), text_glow);
}
FOREACH_CONST( BackgroundLayer, viLowestIndex, bl )
{
iter[*bl]++;
}
}
}
break;