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

Fix warnings.

Browse Source
This commit is contained in:
Steve Checkoway
2005-03-23 21:04:40 +00:00
parent fd86efc075
commit ae02033893
12 changed files with 23 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/Actor.cpp
+1 -1
View File
@@ -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();
stepmania/src/CommonMetrics.cpp
+1 -1
View File
@@ -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<CString> INITIAL_SCREEN ("Common","InitialScreen");
ThemeMetric<CString> FIRST_RUN_INITIAL_SCREEN ("Common","FirstRunInitialScreen");
stepmania/src/InputMapper.cpp
+1 -1
View File
@@ -441,7 +441,7 @@ void InputMapper::SaveMappingsToDisk()
CString sNameString = GameI.toString();
vector<CString> 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 );
stepmania/src/MusicWheel.cpp
+1 -1
View File
@@ -31,7 +31,7 @@
// leaving this one under ScreenSelectMusic because that is the only place it takes effect anyway.
ThemeMetric<CString> 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
stepmania/src/OptionRow.cpp
+4 -4
View File
@@ -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<bool> &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())) );
}
}
stepmania/src/Player.cpp
+3 -3
View File
@@ -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;
stepmania/src/RageDisplay_OGL.cpp
+1 -1
View File
@@ -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 );
stepmania/src/RageMath.cpp
+2 -2
View File
@@ -536,7 +536,7 @@ float RageFastSin( float x )
if( !bInited )
{
bInited = true;
for( int i=0; i<ARRAYSIZE(table); i++ )
for( unsigned i=0; i<ARRAYSIZE(table); i++ )
{
float x = SCALE(i,0,ARRAYSIZE(table),0.0f,PI);
table[i] = sinf(x);
@@ -549,7 +549,7 @@ float RageFastSin( float x )
DEBUG_ASSERT( i>=0 && i<ARRAYSIZE(table)*2 );
float fRet;
if( 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)
stepmania/src/ScreenOptions.cpp
+4 -4
View File
@@ -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 )
{
stepmania/src/ScreenRanking.cpp
+1 -1
View File
@@ -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 ),
stepmania/src/ScreenSelectMaster.cpp
+2 -2
View File
@@ -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); }
stepmania/src/ScreenTextEntry.cpp
+2 -2
View File
@@ -107,7 +107,7 @@ void ScreenTextEntry::Init()
// Init keyboard
FOREACH_KeyboardRow( r )
{
for( unsigned x=0; x<KEYS_PER_ROW; x++ )
for( int x=0; x<KEYS_PER_ROW; ++x )
{
BitmapText &bt = m_textKeyboardChars[r][x];
bt.LoadFromFont( THEME->GetPathF(m_sName,"keyboard") );
@@ -144,7 +144,7 @@ void ScreenTextEntry::UpdateKeyboardText()
{
FOREACH_KeyboardRow( r )
{
for( unsigned x=0; x<KEYS_PER_ROW; x++ )
for( int x=0; x<KEYS_PER_ROW; ++x )
{
const char *s = g_szKeys[r][x];
BitmapText &bt = m_textKeyboardChars[r][x];