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

fix minor warnings

Browse Source
This commit is contained in:
Glenn Maynard
2003-03-05 23:47:08 +00:00
parent be89073042
commit 70af758545
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/BGAnimationLayer.cpp
+3 -3
View File
@@ -263,7 +263,7 @@ void BGAnimationLayer::LoadFromAniLayerFile( CString sPath, CString sSongBGPath
int iSpriteArea = int( m_Sprites[0].GetUnzoomedWidth()*m_Sprites[0].GetUnzoomedHeight() ); int iSpriteArea = int( m_Sprites[0].GetUnzoomedWidth()*m_Sprites[0].GetUnzoomedHeight() );
int iMaxArea = SCREEN_WIDTH*SCREEN_HEIGHT; int iMaxArea = SCREEN_WIDTH*SCREEN_HEIGHT;
m_iNumSprites = m_iNumParticles = iMaxArea / iSpriteArea; m_iNumSprites = m_iNumParticles = iMaxArea / iSpriteArea;
m_iNumSprites = m_iNumParticles = min( m_iNumSprites, MAX_SPRITES ); m_iNumSprites = m_iNumParticles = min( m_iNumSprites, unsigned(MAX_SPRITES) );
for( unsigned i=0; i<m_iNumSprites; i++ ) for( unsigned i=0; i<m_iNumSprites; i++ )
{ {
m_Sprites[i].Load( sPath ); m_Sprites[i].Load( sPath );
@@ -669,7 +669,7 @@ void BGAnimationLayer::Update( float fDeltaTime )
float fTotalWidth = m_iNumTilesWide * m_fTilesSpacingX; float fTotalWidth = m_iNumTilesWide * m_fTilesSpacingX;
float fTotalHeight = m_iNumTilesHigh * m_fTilesSpacingY; float fTotalHeight = m_iNumTilesHigh * m_fTilesSpacingY;
ASSERT( m_iNumSprites == m_iNumTilesWide * m_iNumTilesHigh ); ASSERT( int(m_iNumSprites) == m_iNumTilesWide * m_iNumTilesHigh );
for( int x=0; x<m_iNumTilesWide; x++ ) for( int x=0; x<m_iNumTilesWide; x++ )
{ {
@@ -844,7 +844,7 @@ void BGAnimationLayer::GainingFocus()
// if movie texture, pause and play movie so we don't waste CPU cycles decoding frames that won't be shown // if movie texture, pause and play movie so we don't waste CPU cycles decoding frames that won't be shown
m_Sprites[0].GetTexture()->Play(); m_Sprites[0].GetTexture()->Play();
for( int i=0; i<m_iNumSprites; i++ ) for( unsigned i=0; i<m_iNumSprites; i++ )
m_Sprites[i].Command( m_sCommand ); m_Sprites[i].Command( m_sCommand );
} }
stepmania/src/BGAnimationLayer.h
+1 -1
View File
@@ -43,7 +43,7 @@ public:
protected: protected:
Sprite m_Sprites[MAX_SPRITES]; Sprite m_Sprites[MAX_SPRITES];
RageVector3 m_vParticleVelocity[MAX_SPRITES]; RageVector3 m_vParticleVelocity[MAX_SPRITES];
int m_iNumSprites; unsigned m_iNumSprites;
enum Effect { enum Effect {
EFFECT_CENTER, EFFECT_CENTER,