Warning fixes.

This commit is contained in:
Jason Felds
2011-06-11 09:36:17 -04:00
parent c06763db85
commit 5ef549d80d
3 changed files with 8 additions and 7 deletions
+3 -3
View File
@@ -123,14 +123,14 @@ GameState::GameState() :
m_pCurTrail( Message_CurrentTrailP1Changed ), m_pCurTrail( Message_CurrentTrailP1Changed ),
m_bGameplayLeadIn( Message_GameplayLeadInChanged ), m_bGameplayLeadIn( Message_GameplayLeadInChanged ),
m_bDidModeChangeNoteSkin( false ), m_bDidModeChangeNoteSkin( false ),
m_bIsUsingStepTiming( true ),
m_bInStepEditor( false ),
m_stEdit( Message_EditStepsTypeChanged ), m_stEdit( Message_EditStepsTypeChanged ),
m_cdEdit( Message_EditCourseDifficultyChanged ), m_cdEdit( Message_EditCourseDifficultyChanged ),
m_pEditSourceSteps( Message_EditSourceStepsChanged ), m_pEditSourceSteps( Message_EditSourceStepsChanged ),
m_stEditSource( Message_EditSourceStepsTypeChanged ), m_stEditSource( Message_EditSourceStepsTypeChanged ),
m_iEditCourseEntryIndex( Message_EditCourseEntryIndexChanged ), m_iEditCourseEntryIndex( Message_EditCourseEntryIndexChanged ),
m_sEditLocalProfileID( Message_EditLocalProfileIDChanged ), m_sEditLocalProfileID( Message_EditLocalProfileIDChanged )
m_bIsUsingStepTiming( true ),
m_bInStepEditor( false )
{ {
g_pImpl = new GameStateImpl; g_pImpl = new GameStateImpl;
+2 -2
View File
@@ -1476,11 +1476,11 @@ RString MusicWheel::JumpToPrevGroup()
// in case it wasn't found above: // in case it wasn't found above:
for( unsigned int i = m_CurWheelItemData.size()-1; i > 0; --i ) for( unsigned int i = m_CurWheelItemData.size()-1; i > 0; --i )
{ {
LOG->Trace( ssprintf("JumpToPrevGroup iteration 2 | i = %u",i) ); LOG->Trace( "JumpToPrevGroup iteration 2 | i = %u",i );
if( m_CurWheelItemData[i]->m_Type == TYPE_SECTION ) if( m_CurWheelItemData[i]->m_Type == TYPE_SECTION )
{ {
m_iSelection = i; m_iSelection = i;
LOG->Trace( ssprintf("finding it in #2 | i = %u | text = %s",i, m_CurWheelItemData[i]->m_sText.c_str()) ); LOG->Trace( "finding it in #2 | i = %u | text = %s",i, m_CurWheelItemData[i]->m_sText.c_str() );
return m_CurWheelItemData[i]->m_sText; return m_CurWheelItemData[i]->m_sText;
} }
} }
+3 -2
View File
@@ -32,8 +32,9 @@ Steps::Steps(): m_StepsType(StepsType_Invalid),
m_sNoteDataCompressed(""), m_sFilename(""), m_bSavedToDisk(false), m_sNoteDataCompressed(""), m_sFilename(""), m_bSavedToDisk(false),
m_LoadedFromProfile(ProfileSlot_Invalid), m_iHash(0), m_LoadedFromProfile(ProfileSlot_Invalid), m_iHash(0),
m_sDescription(""), m_sChartStyle(""), m_sDescription(""), m_sChartStyle(""),
m_Difficulty(Difficulty_Invalid), m_iMeter(0), m_sCredit(""), m_Difficulty(Difficulty_Invalid), m_iMeter(0),
m_bAreCachedRadarValuesJustLoaded(false) {} m_bAreCachedRadarValuesJustLoaded(false),
m_sCredit("") {}
Steps::~Steps() Steps::~Steps()
{ {