From 5a83da5411275fdb5e9e48228c6de0cd8751a9fd Mon Sep 17 00:00:00 2001 From: Glenn Maynard Date: Mon, 7 Feb 2005 04:00:18 +0000 Subject: [PATCH] cleanup --- stepmania/src/DancingCharacters.cpp | 8 ++++---- stepmania/src/DancingCharacters.h | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/stepmania/src/DancingCharacters.cpp b/stepmania/src/DancingCharacters.cpp index fee0357ac9..777d2baacf 100644 --- a/stepmania/src/DancingCharacters.cpp +++ b/stepmania/src/DancingCharacters.cpp @@ -303,12 +303,12 @@ void DancingCharacters::Update( float fDelta ) } } -void DancingCharacters::Change2DAnimState(int iPlayerNum, int iState) +void DancingCharacters::Change2DAnimState( PlayerNumber pn, int iState ) { - if(iPlayerNum >= NUM_PLAYERS) { ASSERT(0); } // player out of bounds? - if(iState >= AS2D_MAXSTATES) { ASSERT(0); } // invalid state? + ASSERT( pn < NUM_PLAYERS ); + ASSERT( iState < AS2D_MAXSTATES ); - m_i2DAnimState[iPlayerNum] = iState; + m_i2DAnimState[pn] = iState; } void DancingCharacters::DrawPrimitives() diff --git a/stepmania/src/DancingCharacters.h b/stepmania/src/DancingCharacters.h index 5cfd28a11e..1b23f3a473 100644 --- a/stepmania/src/DancingCharacters.h +++ b/stepmania/src/DancingCharacters.h @@ -33,7 +33,7 @@ public: virtual void Update( float fDelta ); virtual void DrawPrimitives(); bool m_bDrawDangerLight; - void Change2DAnimState(int iPlayerNum, int iState); + void Change2DAnimState( PlayerNumber pn, int iState ); protected: Model *m_pCharacter[NUM_PLAYERS];