diff --git a/stepmania/src/Actor.h b/stepmania/src/Actor.h index bd817280ea..0e9a827763 100644 --- a/stepmania/src/Actor.h +++ b/stepmania/src/Actor.h @@ -103,7 +103,7 @@ public: }; void Draw(); // calls, NeedsDraw, BeginDraw, DrawPrimitives, EndDraw - virtual bool EarlyAbortDraw() { return false; } // return true to early abort drawing of this Actor + virtual bool EarlyAbortDraw() const { return false; } // return true to early abort drawing of this Actor virtual void BeginDraw(); // pushes transform onto world matrix stack virtual void SetGlobalRenderStates(); // Actor should call this at beginning of their DrawPrimitives() virtual void SetTextureRenderStates(); // Actor should call this after setting a texture diff --git a/stepmania/src/BGAnimationLayer.cpp b/stepmania/src/BGAnimationLayer.cpp index 802e666676..66ad8aae59 100644 --- a/stepmania/src/BGAnimationLayer.cpp +++ b/stepmania/src/BGAnimationLayer.cpp @@ -660,7 +660,7 @@ void BGAnimationLayer::UpdateInternal( float fDeltaTime ) } } -bool BGAnimationLayer::EarlyAbortDraw() +bool BGAnimationLayer::EarlyAbortDraw() const { if( m_sDrawCond.empty() ) return false; diff --git a/stepmania/src/BGAnimationLayer.h b/stepmania/src/BGAnimationLayer.h index e7b709fdf5..dc0b182304 100644 --- a/stepmania/src/BGAnimationLayer.h +++ b/stepmania/src/BGAnimationLayer.h @@ -21,7 +21,7 @@ public: void LoadFromNode( const CString& sDir, const XNode* pNode ); void UpdateInternal( float fDeltaTime ); - bool EarlyAbortDraw(); + bool EarlyAbortDraw() const; float GetMaxTweenTimeLeft() const; diff --git a/stepmania/src/BitmapText.cpp b/stepmania/src/BitmapText.cpp index 1f5637ad96..a0518c1b31 100644 --- a/stepmania/src/BitmapText.cpp +++ b/stepmania/src/BitmapText.cpp @@ -496,7 +496,7 @@ void BitmapText::CropToWidth( int iMaxWidthInSourcePixels ) BuildChars(); } -bool BitmapText::EarlyAbortDraw() +bool BitmapText::EarlyAbortDraw() const { return m_wTextLines.empty(); } diff --git a/stepmania/src/BitmapText.h b/stepmania/src/BitmapText.h index edbf950ca9..56a3c826f9 100644 --- a/stepmania/src/BitmapText.h +++ b/stepmania/src/BitmapText.h @@ -26,7 +26,7 @@ public: void SetWrapWidthPixels( int iWrapWidthPixels ); void CropToWidth( int iWidthInSourcePixels ); - virtual bool EarlyAbortDraw(); + virtual bool EarlyAbortDraw() const; virtual void DrawPrimitives(); void TurnRainbowOn() { m_bRainbow = true; }; diff --git a/stepmania/src/HoldGhostArrow.h b/stepmania/src/HoldGhostArrow.h index d38d58467f..3b9583e8c0 100644 --- a/stepmania/src/HoldGhostArrow.h +++ b/stepmania/src/HoldGhostArrow.h @@ -14,7 +14,7 @@ public: virtual void Load( const CString &sButton, const CString &sElement ); virtual void Update( float fDeltaTime ); - virtual bool EarlyAbortDraw() { return !m_bHoldIsActive; } + virtual bool EarlyAbortDraw() const { return !m_bHoldIsActive; } void SetHoldIsActive( bool bHoldIsActive ) { m_bHoldIsActive = bHoldIsActive; } diff --git a/stepmania/src/Model.cpp b/stepmania/src/Model.cpp index 99e72954d6..0cf6ff9394 100644 --- a/stepmania/src/Model.cpp +++ b/stepmania/src/Model.cpp @@ -297,7 +297,7 @@ bool Model::LoadMilkshapeAsciiBones( CString sAniName, CString sPath ) return true; } -bool Model::EarlyAbortDraw() +bool Model::EarlyAbortDraw() const { return m_pGeometry == NULL || m_pGeometry->m_Meshes.empty(); } diff --git a/stepmania/src/Model.h b/stepmania/src/Model.h index e86fd49c24..91f3b227e3 100644 --- a/stepmania/src/Model.h +++ b/stepmania/src/Model.h @@ -32,7 +32,7 @@ public: void PlayAnimation( CString sAniName, float fPlayRate = 1 ); virtual void Update( float fDelta ); - virtual bool EarlyAbortDraw(); + virtual bool EarlyAbortDraw() const; virtual void DrawPrimitives(); void DrawCelShaded(); diff --git a/stepmania/src/Sprite.cpp b/stepmania/src/Sprite.cpp index 2fc9de393d..985c1c74d0 100644 --- a/stepmania/src/Sprite.cpp +++ b/stepmania/src/Sprite.cpp @@ -545,7 +545,7 @@ RageColor scale( float x, float l1, float h1, const RageColor &a, const RageColo SCALE( x, l1, h1, a.a, b.a ) ); } -bool Sprite::EarlyAbortDraw() +bool Sprite::EarlyAbortDraw() const { return m_pTexture == NULL && !m_bDrawIfTextureNull; // return false; diff --git a/stepmania/src/Sprite.h b/stepmania/src/Sprite.h index ae296b2256..d4c64f31dd 100644 --- a/stepmania/src/Sprite.h +++ b/stepmania/src/Sprite.h @@ -18,7 +18,7 @@ public: void LoadFromNode( const CString& sDir, const XNode* pNode ); virtual Actor *Copy() const; - virtual bool EarlyAbortDraw(); + virtual bool EarlyAbortDraw() const; virtual void DrawPrimitives(); virtual void Update( float fDeltaTime ); diff --git a/stepmania/src/Transition.cpp b/stepmania/src/Transition.cpp index 93ef05b5e6..983ecd5a63 100644 --- a/stepmania/src/Transition.cpp +++ b/stepmania/src/Transition.cpp @@ -104,7 +104,7 @@ void Transition::Reset() } } -bool Transition::EarlyAbortDraw() +bool Transition::EarlyAbortDraw() const { return m_State == waiting; } diff --git a/stepmania/src/Transition.h b/stepmania/src/Transition.h index 120d85f653..449c3ccae6 100644 --- a/stepmania/src/Transition.h +++ b/stepmania/src/Transition.h @@ -19,7 +19,7 @@ public: virtual void UpdateInternal( float fDeltaTime ); virtual void StartTransitioning( ScreenMessage send_when_done = SM_None ); - virtual bool EarlyAbortDraw(); + virtual bool EarlyAbortDraw() const; virtual float GetTweenTimeLeft() const; void Reset(); // explicitly allow transitioning again diff --git a/stepmania/src/WheelNotifyIcon.cpp b/stepmania/src/WheelNotifyIcon.cpp index 80bc9c396b..1345a3e6fa 100644 --- a/stepmania/src/WheelNotifyIcon.cpp +++ b/stepmania/src/WheelNotifyIcon.cpp @@ -59,7 +59,7 @@ void WheelNotifyIcon::SetFlags( Flags flags ) Update(0); } -bool WheelNotifyIcon::EarlyAbortDraw() +bool WheelNotifyIcon::EarlyAbortDraw() const { if( m_vIconsToShow.empty() ) return true; diff --git a/stepmania/src/WheelNotifyIcon.h b/stepmania/src/WheelNotifyIcon.h index 5c728e51b1..ba9deb35b0 100644 --- a/stepmania/src/WheelNotifyIcon.h +++ b/stepmania/src/WheelNotifyIcon.h @@ -22,7 +22,7 @@ public: void SetFlags( Flags flags ); virtual void Update( float fDeltaTime ); - virtual bool EarlyAbortDraw(); + virtual bool EarlyAbortDraw() const; protected: enum Icons { training=0, best1, best2, best3, edits, long_ver, marathon, empty };