From eb59caa86e8276fda495801d3ea5472d78b15bff Mon Sep 17 00:00:00 2001 From: Glenn Maynard Date: Tue, 17 Dec 2002 10:39:33 +0000 Subject: [PATCH] use builtins for booleans --- stepmania/src/NotesLoaderKSF.cpp | 2 +- stepmania/src/Sprite.cpp | 6 +++--- stepmania/src/Sprite.h | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/stepmania/src/NotesLoaderKSF.cpp b/stepmania/src/NotesLoaderKSF.cpp index c3b84c41ea..ad3ebed7df 100644 --- a/stepmania/src/NotesLoaderKSF.cpp +++ b/stepmania/src/NotesLoaderKSF.cpp @@ -258,7 +258,7 @@ bool KSFLoader::LoadFromDir( CString sDir, Song &out ) if( !arrayPossibleMusic.empty() ) // we found a match out.m_sMusicFile = arrayPossibleMusic[0]; - return TRUE; + return true; } diff --git a/stepmania/src/Sprite.cpp b/stepmania/src/Sprite.cpp index 02a8fec38a..735711cb64 100644 --- a/stepmania/src/Sprite.cpp +++ b/stepmania/src/Sprite.cpp @@ -29,7 +29,7 @@ Sprite::Sprite() m_bDrawIfTextureNull = false; m_iNumStates = 0; m_iCurState = 0; - m_bIsAnimating = TRUE; + m_bIsAnimating = true; m_fSecsIntoState = 0.0; m_bUsingCustomTexCoords = false; } @@ -101,7 +101,7 @@ bool Sprite::LoadFromSpriteFile( CString sSpritePath, RageTexturePrefs prefs ) break; if( m_iStateToFrame[i] >= m_pTexture->GetNumFrames() ) 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; if( !ini.GetValueF( "Sprite", sDelayKey, m_fDelay[i] ) ) break; @@ -239,7 +239,7 @@ void Sprite::DrawPrimitives() } else { - UINT uFrameNo = m_iStateToFrame[m_iCurState]; + unsigned int uFrameNo = m_iStateToFrame[m_iCurState]; const RectF *pTexCoordRect = m_pTexture->GetTextureCoordRect( uFrameNo ); v[0].t = RageVector2( pTexCoordRect->left, pTexCoordRect->top ); // top left diff --git a/stepmania/src/Sprite.h b/stepmania/src/Sprite.h index d6e409d636..58ec7ba549 100644 --- a/stepmania/src/Sprite.h +++ b/stepmania/src/Sprite.h @@ -43,8 +43,8 @@ public: virtual void DrawPrimitives(); virtual void Update( float fDeltaTime ); - 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 StartAnimating() { m_bIsAnimating = true; if(m_pTexture) m_pTexture->Play(); }; + virtual void StopAnimating() { m_bIsAnimating = false; if(m_pTexture) m_pTexture->Pause(); }; virtual void SetState( int iNewState ); int GetNumStates() { return m_iNumStates; };