Fixed VC6 compile errors

This commit is contained in:
Chris Danford
2002-10-06 17:02:04 +00:00
parent 107a1521e6
commit 6ab57e3faa
3 changed files with 26 additions and 30 deletions
+2
View File
@@ -188,6 +188,7 @@ ScreenEvaluation::ScreenEvaluation( bool bSummary )
switch( m_ResultMode ) switch( m_ResultMode )
{ {
case RM_ARCADE_STAGE: case RM_ARCADE_STAGE:
{
m_BannerWithFrame[0].LoadFromSong( GAMESTATE->m_pCurSong ); m_BannerWithFrame[0].LoadFromSong( GAMESTATE->m_pCurSong );
m_BannerWithFrame[0].SetXY( BANNER_X, BANNER_Y ); m_BannerWithFrame[0].SetXY( BANNER_X, BANNER_Y );
this->AddChild( &m_BannerWithFrame[0] ); this->AddChild( &m_BannerWithFrame[0] );
@@ -208,6 +209,7 @@ ScreenEvaluation::ScreenEvaluation( bool bSummary )
m_DifficultyIcon[p].SetXY( DIFFICULTY_ICON_X(p), DIFFICULTY_ICON_Y(p) ); m_DifficultyIcon[p].SetXY( DIFFICULTY_ICON_X(p), DIFFICULTY_ICON_Y(p) );
this->AddChild( &m_DifficultyIcon[p] ); this->AddChild( &m_DifficultyIcon[p] );
} }
}
break; break;
case RM_ARCADE_SUMMARY: case RM_ARCADE_SUMMARY:
{ {
+4 -2
View File
@@ -225,15 +225,17 @@ void ScreenSelectMode::RefreshModeChoices()
GAMEMAN->GetModesChoicesForGame( GAMESTATE->m_CurGame, m_aPossibleModeChoices ); GAMEMAN->GetModesChoicesForGame( GAMESTATE->m_CurGame, m_aPossibleModeChoices );
ASSERT( m_aPossibleModeChoices.GetSize() > 0 ); ASSERT( m_aPossibleModeChoices.GetSize() > 0 );
int i;
// remove ModeChoices that won't work with the current number of players // remove ModeChoices that won't work with the current number of players
for( int i=m_aPossibleModeChoices.GetSize()-1; i>=0; i-- ) for( i=m_aPossibleModeChoices.GetSize()-1; i>=0; i-- )
if( m_aPossibleModeChoices[i].numSidesJoinedToPlay != iNumSidesJoined ) if( m_aPossibleModeChoices[i].numSidesJoinedToPlay != iNumSidesJoined )
m_aPossibleModeChoices.RemoveAt( i ); m_aPossibleModeChoices.RemoveAt( i );
CString sGameName = GAMESTATE->GetCurrentGameDef()->m_szName; CString sGameName = GAMESTATE->GetCurrentGameDef()->m_szName;
CStringArray asGraphicPaths; CStringArray asGraphicPaths;
for( int i=0; i<m_aPossibleModeChoices.GetSize(); i++ ) for( i=0; i<m_aPossibleModeChoices.GetSize(); i++ )
{ {
const ModeChoice& choice = m_aPossibleModeChoices[i]; const ModeChoice& choice = m_aPossibleModeChoices[i];
asGraphicPaths.Add( THEME->GetPathTo("Graphics", ssprintf("select mode choice %s %s", sGameName, choice.name) ) ); asGraphicPaths.Add( THEME->GetPathTo("Graphics", ssprintf("select mode choice %s %s", sGameName, choice.name) ) );
-8
View File
@@ -907,14 +907,6 @@ SOURCE=.\Combo.h
# End Source File # End Source File
# Begin Source File # Begin Source File
SOURCE=.\DifficultyBanner.cpp
# End Source File
# Begin Source File
SOURCE=.\DifficultyBanner.h
# End Source File
# Begin Source File
SOURCE=.\FocusingSprite.cpp SOURCE=.\FocusingSprite.cpp
# End Source File # End Source File
# Begin Source File # Begin Source File