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

use builtins for booleans

Browse Source
This commit is contained in:
Glenn Maynard
2002-12-17 10:39:33 +00:00
parent fc4c96abcd
commit eb59caa86e
3 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/NotesLoaderKSF.cpp
+1 -1
View File
@@ -258,7 +258,7 @@ bool KSFLoader::LoadFromDir( CString sDir, Song &out )
if( !arrayPossibleMusic.empty() ) // we found a match if( !arrayPossibleMusic.empty() ) // we found a match
out.m_sMusicFile = arrayPossibleMusic[0]; out.m_sMusicFile = arrayPossibleMusic[0];
return TRUE; return true;
} }
stepmania/src/Sprite.cpp
+3 -3
View File
@@ -29,7 +29,7 @@ Sprite::Sprite()
m_bDrawIfTextureNull = false; m_bDrawIfTextureNull = false;
m_iNumStates = 0; m_iNumStates = 0;
m_iCurState = 0; m_iCurState = 0;
m_bIsAnimating = TRUE; m_bIsAnimating = true;
m_fSecsIntoState = 0.0; m_fSecsIntoState = 0.0;
m_bUsingCustomTexCoords = false; m_bUsingCustomTexCoords = false;
} }
@@ -101,7 +101,7 @@ bool Sprite::LoadFromSpriteFile( CString sSpritePath, RageTexturePrefs prefs )
break; break;
if( m_iStateToFrame[i] >= m_pTexture->GetNumFrames() ) if( m_iStateToFrame[i] >= m_pTexture->GetNumFrames() )
throw RageException( "In '%s', %s is %d, but the texture %s only has %d frames.", throw RageException( "In '%s', %s is %d, but the texture %s only has %d frames.",
m_sSpritePath.GetString(), sFrameKey.GetString(), m_iStateToFrame[i], sTexturePath, m_pTexture->GetNumFrames() ); m_sSpritePath.GetString(), sFrameKey.GetString(), m_iStateToFrame[i], sTexturePath.GetString(), m_pTexture->GetNumFrames() );
m_fDelay[i] = 0.2f; m_fDelay[i] = 0.2f;
if( !ini.GetValueF( "Sprite", sDelayKey, m_fDelay[i] ) ) if( !ini.GetValueF( "Sprite", sDelayKey, m_fDelay[i] ) )
break; break;
@@ -239,7 +239,7 @@ void Sprite::DrawPrimitives()
} }
else else
{ {
UINT uFrameNo = m_iStateToFrame[m_iCurState]; unsigned int uFrameNo = m_iStateToFrame[m_iCurState];
const RectF *pTexCoordRect = m_pTexture->GetTextureCoordRect( uFrameNo ); const RectF *pTexCoordRect = m_pTexture->GetTextureCoordRect( uFrameNo );
v[0].t = RageVector2( pTexCoordRect->left, pTexCoordRect->top ); // top left v[0].t = RageVector2( pTexCoordRect->left, pTexCoordRect->top ); // top left
stepmania/src/Sprite.h
+2 -2
View File
@@ -43,8 +43,8 @@ public:
virtual void DrawPrimitives(); virtual void DrawPrimitives();
virtual void Update( float fDeltaTime ); virtual void Update( float fDeltaTime );
virtual void StartAnimating() { m_bIsAnimating = TRUE; if(m_pTexture) m_pTexture->Play(); }; virtual void StartAnimating() { m_bIsAnimating = true; if(m_pTexture) m_pTexture->Play(); };
virtual void StopAnimating() { m_bIsAnimating = FALSE; if(m_pTexture) m_pTexture->Pause(); }; virtual void StopAnimating() { m_bIsAnimating = false; if(m_pTexture) m_pTexture->Pause(); };
virtual void SetState( int iNewState ); virtual void SetState( int iNewState );
int GetNumStates() { return m_iNumStates; }; int GetNumStates() { return m_iNumStates; };