From ae0203389305757143ebf4f24f9990b2229e25cc Mon Sep 17 00:00:00 2001 From: Steve Checkoway Date: Wed, 23 Mar 2005 21:04:40 +0000 Subject: [PATCH] Fix warnings. --- stepmania/src/Actor.cpp | 2 +- stepmania/src/CommonMetrics.cpp | 2 +- stepmania/src/InputMapper.cpp | 2 +- stepmania/src/MusicWheel.cpp | 2 +- stepmania/src/OptionRow.cpp | 8 ++++---- stepmania/src/Player.cpp | 6 +++--- stepmania/src/RageDisplay_OGL.cpp | 2 +- stepmania/src/RageMath.cpp | 4 ++-- stepmania/src/ScreenOptions.cpp | 8 ++++---- stepmania/src/ScreenRanking.cpp | 2 +- stepmania/src/ScreenSelectMaster.cpp | 4 ++-- stepmania/src/ScreenTextEntry.cpp | 4 ++-- 12 files changed, 23 insertions(+), 23 deletions(-) diff --git a/stepmania/src/Actor.cpp b/stepmania/src/Actor.cpp index 2baf004df8..ba3d40715b 100644 --- a/stepmania/src/Actor.cpp +++ b/stepmania/src/Actor.cpp @@ -474,7 +474,7 @@ void Actor::BeginTweening( float time, TweenType tt ) // recursing ActorCommand. if( m_Tweens.size() > 50 ) { - CString sError = ssprintf( "Tween overflow: size = %u. infinitely recursing ActorCommand?", m_Tweens.size() ); + CString sError = ssprintf( "Tween overflow: size = %u. infinitely recursing ActorCommand?", unsigned(m_Tweens.size()) ); LOG->Warn( sError ); Dialog::OK( sError ); FinishTweening(); diff --git a/stepmania/src/CommonMetrics.cpp b/stepmania/src/CommonMetrics.cpp index 530b178da7..9cdfc31f2f 100644 --- a/stepmania/src/CommonMetrics.cpp +++ b/stepmania/src/CommonMetrics.cpp @@ -4,7 +4,7 @@ #include "Foreach.h" -CString PLAYER_COLOR_NAME( size_t p ) { return ssprintf("ColorP%d",p+1); } +CString PLAYER_COLOR_NAME( size_t p ) { return ssprintf("ColorP%d",int(p+1)); } ThemeMetric INITIAL_SCREEN ("Common","InitialScreen"); ThemeMetric FIRST_RUN_INITIAL_SCREEN ("Common","FirstRunInitialScreen"); diff --git a/stepmania/src/InputMapper.cpp b/stepmania/src/InputMapper.cpp index 1d10c9f65b..d72e847729 100644 --- a/stepmania/src/InputMapper.cpp +++ b/stepmania/src/InputMapper.cpp @@ -441,7 +441,7 @@ void InputMapper::SaveMappingsToDisk() CString sNameString = GameI.toString(); vector asValues; - for( unsigned button = 0; button < NUM_GAME_TO_DEVICE_SLOTS; ++button ) + for( int button = 0; button < NUM_GAME_TO_DEVICE_SLOTS; ++button ) asValues.push_back( m_GItoDI[i][j][button].toString() ); while( asValues.size() && asValues.back() == "" ) asValues.erase( asValues.begin()+asValues.size()-1 ); diff --git a/stepmania/src/MusicWheel.cpp b/stepmania/src/MusicWheel.cpp index e744b8b4dd..f8e65b7a92 100644 --- a/stepmania/src/MusicWheel.cpp +++ b/stepmania/src/MusicWheel.cpp @@ -31,7 +31,7 @@ // leaving this one under ScreenSelectMusic because that is the only place it takes effect anyway. ThemeMetric DEFAULT_SORT ("ScreenSelectMusic","DefaultSort"); -static CString SECTION_COLORS_NAME( size_t i ) { return ssprintf("SectionColor%d",i+1); } +static CString SECTION_COLORS_NAME( size_t i ) { return ssprintf("SectionColor%d",int(i+1)); } static CString CHOICE_NAME( CString s ) { return ssprintf("Choice%s",s.c_str()); } const AutoScreenMessage SM_SongChanged; // TODO: Replace this with a Message and MESSAGEMAN diff --git a/stepmania/src/OptionRow.cpp b/stepmania/src/OptionRow.cpp index 8fb98d7410..894a6e7393 100644 --- a/stepmania/src/OptionRow.cpp +++ b/stepmania/src/OptionRow.cpp @@ -55,8 +55,8 @@ static CString OPTION_TITLE( CString s ) return THEME->GetMetric("OptionTitles",s); } -CString ITEMS_LONG_ROW_X_NAME( size_t p ) { return ssprintf("ItemsLongRowP%dX",p+1); } -CString ICONS_X_NAME( size_t p ) { return ssprintf("IconsP%dX",p+1); } +CString ITEMS_LONG_ROW_X_NAME( size_t p ) { return ssprintf("ItemsLongRowP%dX",int(p+1)); } +CString ICONS_X_NAME( size_t p ) { return ssprintf("IconsP%dX",int(p+1)); } OptionRow::OptionRow() { @@ -789,11 +789,11 @@ static void VerifySelected( SelectType st, const vector &vbSelected, const int iNumSelected = 0; if( st == SELECT_ONE ) { - ASSERT_M( vbSelected.size() > 0, ssprintf("%s: %i/%i", sName.c_str(), iNumSelected, vbSelected.size()) ); + ASSERT_M( vbSelected.size() > 0, ssprintf("%s: %i/%i", sName.c_str(), iNumSelected, int(vbSelected.size())) ); for( unsigned e = 0; e < vbSelected.size(); ++e ) if( vbSelected[e] ) iNumSelected++; - ASSERT_M( iNumSelected == 1, ssprintf("%s: %i/%i", sName.c_str(), iNumSelected, vbSelected.size()) ); + ASSERT_M( iNumSelected == 1, ssprintf("%s: %i/%i", sName.c_str(), iNumSelected, int(vbSelected.size())) ); } } diff --git a/stepmania/src/Player.cpp b/stepmania/src/Player.cpp index 48bce656d3..eb7eb3e1cd 100644 --- a/stepmania/src/Player.cpp +++ b/stepmania/src/Player.cpp @@ -37,9 +37,9 @@ #include "MessageManager.h" #include "ProfileManager.h" -CString JUDGMENT_X_NAME( size_t p, size_t both_sides ) { return "JudgmentXOffset" + (both_sides ? CString("BothSides") : ssprintf("OneSideP%d",p+1) ); } -CString COMBO_X_NAME( size_t p, size_t both_sides ) { return "ComboXOffset" + (both_sides ? CString("BothSides") : ssprintf("OneSideP%d",p+1) ); } -CString ATTACK_DISPLAY_X_NAME( size_t p, size_t both_sides ){ return "AttackDisplayXOffset" + (both_sides ? CString("BothSides") : ssprintf("OneSideP%d",p+1) ); } +CString JUDGMENT_X_NAME( size_t p, size_t both_sides ) { return "JudgmentXOffset" + (both_sides ? CString("BothSides") : ssprintf("OneSideP%d",int(p+1)) ); } +CString COMBO_X_NAME( size_t p, size_t both_sides ) { return "ComboXOffset" + (both_sides ? CString("BothSides") : ssprintf("OneSideP%d",int(p+1)) ); } +CString ATTACK_DISPLAY_X_NAME( size_t p, size_t both_sides ){ return "AttackDisplayXOffset" + (both_sides ? CString("BothSides") : ssprintf("OneSideP%d",int(p+1)) ); } /* Distance to search for a note in Step(), in seconds. */ static const float StepSearchDistance = 1.0f; diff --git a/stepmania/src/RageDisplay_OGL.cpp b/stepmania/src/RageDisplay_OGL.cpp index 1ae96b3175..35514000da 100644 --- a/stepmania/src/RageDisplay_OGL.cpp +++ b/stepmania/src/RageDisplay_OGL.cpp @@ -370,7 +370,7 @@ GLhandleARB CompileShader( GLenum ShaderType, CString sBuffer ) GLhandleARB VertexShader = GLExt.glCreateShaderObjectARB( GL_VERTEX_SHADER_ARB ); const GLcharARB *pData = sBuffer.data(); int iLength = sBuffer.size(); - GLExt.glShaderSourceARB( VertexShader, 1, &pData, &iLength ); + GLExt.glShaderSourceARB( VertexShader, 1, &pData, (GLint*)&iLength ); GLExt.glCompileShaderARB( VertexShader ); diff --git a/stepmania/src/RageMath.cpp b/stepmania/src/RageMath.cpp index fe2ab3683a..33d893bd79 100644 --- a/stepmania/src/RageMath.cpp +++ b/stepmania/src/RageMath.cpp @@ -536,7 +536,7 @@ float RageFastSin( float x ) if( !bInited ) { bInited = true; - for( int i=0; i=0 && i= ARRAYSIZE(table) ) // PI <= i < 2*PI + if( i >= int(ARRAYSIZE(table)) ) // PI <= i < 2*PI { // sin(x) == -sin(2*PI-x) i = ARRAYSIZE(table)*2 - 1 - i; // mirror about ARRAYSIZE(table) diff --git a/stepmania/src/ScreenOptions.cpp b/stepmania/src/ScreenOptions.cpp index 5bea56daf7..63655e4eae 100644 --- a/stepmania/src/ScreenOptions.cpp +++ b/stepmania/src/ScreenOptions.cpp @@ -62,10 +62,10 @@ const float TWEEN_SECONDS = 0.3f; -static CString ROW_Y_NAME( size_t r ) { return ssprintf("Row%dY",r+1); } -static CString EXPLANATION_X_NAME( size_t p ) { return ssprintf("ExplanationP%dX",p+1); } -static CString EXPLANATION_Y_NAME( size_t p ) { return ssprintf("ExplanationP%dY",p+1); } -static CString EXPLANATION_ON_COMMAND_NAME( size_t p ) { return ssprintf("ExplanationP%dOnCommand",p+1); } +static CString ROW_Y_NAME( size_t r ) { return ssprintf("Row%dY",int(r+1)); } +static CString EXPLANATION_X_NAME( size_t p ) { return ssprintf("ExplanationP%dX",int(p+1)); } +static CString EXPLANATION_Y_NAME( size_t p ) { return ssprintf("ExplanationP%dY",int(p+1)); } +static CString EXPLANATION_ON_COMMAND_NAME( size_t p ) { return ssprintf("ExplanationP%dOnCommand",int(p+1)); } static CString OPTION_EXPLANATION( CString s ) { diff --git a/stepmania/src/ScreenRanking.cpp b/stepmania/src/ScreenRanking.cpp index 0df834265e..152d3e953b 100644 --- a/stepmania/src/ScreenRanking.cpp +++ b/stepmania/src/ScreenRanking.cpp @@ -47,7 +47,7 @@ const AutoScreenMessage SM_ShowNextPage; const AutoScreenMessage SM_HidePage; -CString STEPS_TYPE_COLOR_NAME( size_t i ) { return ssprintf("StepsTypeColor%d",i+1); } +CString STEPS_TYPE_COLOR_NAME( size_t i ) { return ssprintf("StepsTypeColor%d",int(i+1)); } REGISTER_SCREEN_CLASS( ScreenRanking ); ScreenRanking::ScreenRanking( CString sClassName ) : ScreenAttract( sClassName ), diff --git a/stepmania/src/ScreenSelectMaster.cpp b/stepmania/src/ScreenSelectMaster.cpp index 2bda38bfef..07ad67dff0 100644 --- a/stepmania/src/ScreenSelectMaster.cpp +++ b/stepmania/src/ScreenSelectMaster.cpp @@ -17,8 +17,8 @@ const AutoScreenMessage SM_PlayPostSwitchPage; -CString CURSOR_OFFSET_X_FROM_ICON_NAME( size_t p, size_t part ) { return ssprintf("CursorPart%dP%dOffsetXFromIcon",part+1,p+1); } -CString CURSOR_OFFSET_Y_FROM_ICON_NAME( size_t p, size_t part ) { return ssprintf("CursorPart%dP%dOffsetYFromIcon",part+1,p+1); } +CString CURSOR_OFFSET_X_FROM_ICON_NAME( size_t p, size_t part ) { return ssprintf("CursorPart%dP%dOffsetXFromIcon",int(part+1),int(p+1)); } +CString CURSOR_OFFSET_Y_FROM_ICON_NAME( size_t p, size_t part ) { return ssprintf("CursorPart%dP%dOffsetYFromIcon",int(part+1),int(p+1)); } /* e.g. "OptionOrderLeft=0:1,1:2,2:3,3:4" */ CString OPTION_ORDER_NAME( size_t dir ) { return "OptionOrder"+MenuDirToString((MenuDir)dir); } diff --git a/stepmania/src/ScreenTextEntry.cpp b/stepmania/src/ScreenTextEntry.cpp index e650961a33..b02be03002 100644 --- a/stepmania/src/ScreenTextEntry.cpp +++ b/stepmania/src/ScreenTextEntry.cpp @@ -107,7 +107,7 @@ void ScreenTextEntry::Init() // Init keyboard FOREACH_KeyboardRow( r ) { - for( unsigned x=0; xGetPathF(m_sName,"keyboard") ); @@ -144,7 +144,7 @@ void ScreenTextEntry::UpdateKeyboardText() { FOREACH_KeyboardRow( r ) { - for( unsigned x=0; x