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

fix VC7 warnings

Browse Source
This commit is contained in:
Chris Danford
2003-10-22 12:28:30 +00:00
parent 513f9709ca
commit bd585e46a1
5 changed files with 13 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/RageSoundManager.cpp
-1
View File
@@ -312,7 +312,6 @@ void SoundMixBuffer::write(const Sint16 *buf, unsigned size)
void SoundMixBuffer::read(Sint16 *buf) void SoundMixBuffer::read(Sint16 *buf)
{ {
int clip=0;
for(unsigned pos = 0; pos < used; ++pos) for(unsigned pos = 0; pos < used; ++pos)
{ {
Sint32 out = (mixbuf[pos]) / 256; Sint32 out = (mixbuf[pos]) / 256;
stepmania/src/ScreenEvaluation.cpp
+2 -2
View File
@@ -185,11 +185,11 @@ ScreenEvaluation::ScreenEvaluation( CString sClassName ) : Screen(sClassName)
case stage: case stage:
{ {
ASSERT( GAMESTATE->m_pCurNotes[p] ); ASSERT( GAMESTATE->m_pCurNotes[p] );
float score; int score;
if( PREFSMAN->m_bPercentageScoring ) if( PREFSMAN->m_bPercentageScoring )
score = stageStats.GetPercentDancePoints( (PlayerNumber)p ); score = stageStats.GetPercentDancePoints( (PlayerNumber)p );
else else
score = float(stageStats.iScore[p] + stageStats.iBonus[p]); score = stageStats.iScore[p] + stageStats.iBonus[p];
Steps::MemCardData::HighScore hs; Steps::MemCardData::HighScore hs;
hs.grade = grade[p]; hs.grade = grade[p];
hs.iScore = score; hs.iScore = score;
stepmania/src/ScreenOptionsMasterPrefs.cpp
+1
View File
@@ -465,6 +465,7 @@ static const ConfOption g_ConfOptions[] =
ConfOption( "Preload\nSounds", PreloadSounds, "NO","YES" ), ConfOption( "Preload\nSounds", PreloadSounds, "NO","YES" ),
ConfOption( "Resampling\nQuality", ResamplingQuality, "FAST","NORMAL","HIGH QUALITY" ), ConfOption( "Resampling\nQuality", ResamplingQuality, "FAST","NORMAL","HIGH QUALITY" ),
ConfOption( "Attract\nSound", AttractSound, "OFF","ON" ), ConfOption( "Attract\nSound", AttractSound, "OFF","ON" ),
ConfOption( "Demonstartion\nSound", DemonstrationSound, "OFF","ON" ),
ConfOption( "Sound\nVolume", SoundVolume, "0%","10%","20%","30%","40%","50%","60%","70%","80%","90%","100%","10%" ), ConfOption( "Sound\nVolume", SoundVolume, "0%","10%","20%","30%","40%","50%","60%","70%","80%","90%","100%","10%" ),
ConfOption( "", NULL ) // end marker ConfOption( "", NULL ) // end marker
}; };
stepmania/src/ScreenRanking.cpp
+2 -3
View File
@@ -146,7 +146,6 @@ ScreenRanking::ScreenRanking( CString sClassName ) : ScreenAttract( sClassName )
// init all the difficulty graphics // init all the difficulty graphics
for( int d=0; d<NUM_DIFFICULTIES; d++ ) for( int d=0; d<NUM_DIFFICULTIES; d++ )
{ {
Difficulty diff = (Difficulty)d;
bool bShowThis = find(m_vDiffsToShow.begin(), m_vDiffsToShow.end(), d) != m_vDiffsToShow.end(); bool bShowThis = find(m_vDiffsToShow.begin(), m_vDiffsToShow.end(), d) != m_vDiffsToShow.end();
m_sprDiffHeaders[d].Load( THEME->GetPathToG(("ScreenRanking difficulty 1x5")) ); m_sprDiffHeaders[d].Load( THEME->GetPathToG(("ScreenRanking difficulty 1x5")) );
@@ -226,7 +225,7 @@ ScreenRanking::ScreenRanking( CString sClassName ) : ScreenAttract( sClassName )
{ {
for( unsigned i=0; i<aNotesTypesToShow.size(); i++ ) for( unsigned i=0; i<aNotesTypesToShow.size(); i++ )
{ {
for( unsigned j=0; j<NUM_SONGS_TO_SHOW; j++ ) for( int j=0; j<NUM_SONGS_TO_SHOW; j++ )
{ {
PageToShow pts; PageToShow pts;
pts.type = PageToShow::TYPE_SONG; pts.type = PageToShow::TYPE_SONG;
@@ -281,7 +280,7 @@ void ScreenRanking::HandleScreenMessage( const ScreenMessage SM )
void ScreenRanking::SetPage( PageToShow pts ) void ScreenRanking::SetPage( PageToShow pts )
{ {
bool bShowNames, bShowScores, bShowPoints, bShowTime, bShowDifficulty, bShowPercent; bool bShowNames=false, bShowScores=false, bShowPoints=false, bShowTime=false, bShowDifficulty=false, bShowPercent=false;
switch( pts.type ) switch( pts.type )
{ {
case PageToShow::TYPE_CATEGORY: case PageToShow::TYPE_CATEGORY: