actions/itgmania212121
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

fix sign warnings

Browse Source
This commit is contained in:
Chris Danford
2004-02-13 08:15:05 +00:00
parent 7bc539ec2b
commit 6d7865eb3e
1 changed files with 40 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/ScreenSelect.cpp
+39 -30
View File
@@ -44,45 +44,54 @@ ScreenSelect::ScreenSelect( CString sClassName ) : Screen(sClassName)
m_sName = sClassName; m_sName = sClassName;
// Instead of using NUM_CHOICES, use a comma-separated list of choices. Each //
// element in the list is a choice name. This level of indirection // Load choices
// makes it easier to add or remove items without having to change a bunch //
// of indices.
CStringArray asChoiceNames;
split( CHOICE_NAMES, ",", asChoiceNames, true );
int c;
for( c=0; c<asChoiceNames.size(); c++ )
{ {
CString sChoiceName = asChoiceNames[c]; // Instead of using NUM_CHOICES, use a comma-separated list of choices. Each
CString sChoice = CHOICE(sChoiceName); // element in the list is a choice name. This level of indirection
// makes it easier to add or remove items without having to change a bunch
// of indices.
CStringArray asChoiceNames;
split( CHOICE_NAMES, ",", asChoiceNames, true );
ModeChoice mc; for( unsigned c=0; c<asChoiceNames.size(); c++ )
mc.m_sName = sChoiceName; {
mc.Load( c, sChoice ); CString sChoiceName = asChoiceNames[c];
m_aModeChoices.push_back( mc ); CString sChoice = CHOICE(sChoiceName);
CString sBGAnimationDir = THEME->GetPathTo(BGAnimations, m_sName, mc.m_sName, true); // true="optional" ModeChoice mc;
if( sBGAnimationDir == "" ) mc.m_sName = sChoiceName;
sBGAnimationDir = THEME->GetPathToB(m_sName+" background"); mc.Load( c, sChoice );
BGAnimation *pBGA = new BGAnimation; m_aModeChoices.push_back( mc );
m_vpBGAnimations.push_back( pBGA );
CString sBGAnimationDir = THEME->GetPathTo(BGAnimations, m_sName, mc.m_sName, true); // true="optional"
if( sBGAnimationDir == "" )
sBGAnimationDir = THEME->GetPathToB(m_sName+" background");
BGAnimation *pBGA = new BGAnimation;
m_vpBGAnimations.push_back( pBGA );
}
} }
m_Menu.Load( sClassName ); m_Menu.Load( sClassName );
this->AddChild( &m_Menu ); this->AddChild( &m_Menu );
for( c=0; c<NUM_CODES; c++ ) //
// Load codes
//
{ {
CodeItem code; for( int c=0; c<NUM_CODES; c++ )
if( !code.Load( CODE(c) ) ) {
continue; CodeItem code;
if( !code.Load( CODE(c) ) )
continue;
m_aCodes.push_back( code ); m_aCodes.push_back( code );
m_aCodeActions.push_back( CODE_ACTION(c) ); m_aCodeActions.push_back( CODE_ACTION(c) );
ModeChoice mc; ModeChoice mc;
mc.Load( c, CODE_ACTION(c) ); mc.Load( c, CODE_ACTION(c) );
m_aCodeChoices.push_back( mc ); m_aCodeChoices.push_back( mc );
}
} }
} }
@@ -90,7 +99,7 @@ ScreenSelect::ScreenSelect( CString sClassName ) : Screen(sClassName)
ScreenSelect::~ScreenSelect() ScreenSelect::~ScreenSelect()
{ {
LOG->Trace( "ScreenSelect::~ScreenSelect()" ); LOG->Trace( "ScreenSelect::~ScreenSelect()" );
for( int i=0; i<m_vpBGAnimations.size(); i++ ) for( unsigned i=0; i<m_vpBGAnimations.size(); i++ )
SAFE_DELETE( m_vpBGAnimations[i] ); SAFE_DELETE( m_vpBGAnimations[i] );
m_vpBGAnimations.clear(); m_vpBGAnimations.clear();
} }