From 0b7b6b6f9f263a57ca8382e3c3fd25d8ab6f0669 Mon Sep 17 00:00:00 2001 From: Glenn Maynard Date: Tue, 26 Sep 2006 21:05:49 +0000 Subject: [PATCH] naming cleanups --- stepmania/src/NoteDisplay.cpp | 8 ++++---- stepmania/src/NoteDisplay.h | 24 +++++++++++++----------- stepmania/src/ScreenDemonstration.cpp | 2 +- 3 files changed, 18 insertions(+), 16 deletions(-) diff --git a/stepmania/src/NoteDisplay.cpp b/stepmania/src/NoteDisplay.cpp index a3bf2ed1a3..ca39f442d4 100644 --- a/stepmania/src/NoteDisplay.cpp +++ b/stepmania/src/NoteDisplay.cpp @@ -234,13 +234,13 @@ static const char *HoldTypeNames[] = { "hold", "roll", }; -XToString( HoldType, NUM_HOLD_TYPES ); +XToString( HoldType, NUM_HoldType ); static const char *ActiveTypeNames[] = { "active", "inactive", }; -XToString( ActiveType, NUM_ACTIVE_TYPES ); +XToString( ActiveType, NUM_ActiveType ); @@ -336,12 +336,12 @@ Actor *NoteDisplay::GetTapActor( NoteColorActor &nca, NotePart part, float fNote return pActorOut; } -Actor *NoteDisplay::GetHoldActor( NoteColorActor nca[NUM_HOLD_TYPES][NUM_ACTIVE_TYPES], NotePart part, float fNoteBeat, bool bIsRoll, bool bIsBeingHeld ) +Actor *NoteDisplay::GetHoldActor( NoteColorActor nca[NUM_HoldType][NUM_ActiveType], NotePart part, float fNoteBeat, bool bIsRoll, bool bIsBeingHeld ) { return GetTapActor( nca[bIsRoll ? roll:hold][bIsBeingHeld ? active:inactive], part, fNoteBeat ); } -Sprite *NoteDisplay::GetHoldSprite( NoteColorSprite ncs[NUM_HOLD_TYPES][NUM_ACTIVE_TYPES], NotePart part, float fNoteBeat, bool bIsRoll, bool bIsBeingHeld ) +Sprite *NoteDisplay::GetHoldSprite( NoteColorSprite ncs[NUM_HoldType][NUM_ActiveType], NotePart part, float fNoteBeat, bool bIsRoll, bool bIsBeingHeld ) { Sprite *pSpriteOut = ncs[bIsRoll ? roll:hold][bIsBeingHeld ? active:inactive].Get(); diff --git a/stepmania/src/NoteDisplay.h b/stepmania/src/NoteDisplay.h index 503e0a6383..38626bb0f8 100644 --- a/stepmania/src/NoteDisplay.h +++ b/stepmania/src/NoteDisplay.h @@ -49,18 +49,20 @@ enum HoldType { hold, roll, - NUM_HOLD_TYPES + NUM_HoldType, + HoldType_Invalid }; -#define FOREACH_HoldType( i ) FOREACH_ENUM( HoldType, NUM_HOLD_TYPES, i ) +#define FOREACH_HoldType( i ) FOREACH_ENUM( HoldType, NUM_HoldType, i ) const RString &HoldTypeToString( HoldType ht ); enum ActiveType { active, inactive, - NUM_ACTIVE_TYPES + NUM_ActiveType, + ActiveType_Invalid }; -#define FOREACH_ActiveType( i ) FOREACH_ENUM( ActiveType, NUM_ACTIVE_TYPES, i ) +#define FOREACH_ActiveType( i ) FOREACH_ENUM( ActiveType, NUM_ActiveType, i ) const RString &ActiveTypeToString( ActiveType at ); @@ -83,8 +85,8 @@ public: private: void SetActiveFrame( float fNoteBeat, Actor &actorToSet, float fAnimationLengthInBeats, bool bVivid ); Actor *GetTapActor( NoteColorActor &nca, NotePart part, float fNoteBeat ); - Actor *GetHoldActor( NoteColorActor nca[NUM_HOLD_TYPES][NUM_ACTIVE_TYPES], NotePart part, float fNoteBeat, bool bIsRoll, bool bIsBeingHeld ); - Sprite *GetHoldSprite( NoteColorSprite ncs[NUM_HOLD_TYPES][NUM_ACTIVE_TYPES], NotePart part, float fNoteBeat, bool bIsRoll, bool bIsBeingHeld ); + Actor *GetHoldActor( NoteColorActor nca[NUM_HoldType][NUM_ActiveType], NotePart part, float fNoteBeat, bool bIsRoll, bool bIsBeingHeld ); + Sprite *GetHoldSprite( NoteColorSprite ncs[NUM_HoldType][NUM_ActiveType], NotePart part, float fNoteBeat, bool bIsRoll, bool bIsBeingHeld ); void DrawHoldBottomCap( const TapNote& tn, int iCol, int iRow, bool bIsBeingHeld, float fYHead, float fYTail, int fYStep, float fPercentFadeToFail, float fColorScale, bool bGlow, float fYStartOffset, float fYEndOffset ); void DrawHoldTopCap( const TapNote& tn, int iCol, int iRow, bool bIsBeingHeld, float fYHead, float fYTail, int fYStep, float fPercentFadeToFail, float fColorScale, bool bGlow, float fYStartOffset, float fYEndOffset ); @@ -99,11 +101,11 @@ private: NoteColorActor m_TapAddition; NoteColorActor m_TapMine; NoteColorActor m_TapLift; - NoteColorActor m_HoldHead[NUM_HOLD_TYPES][NUM_ACTIVE_TYPES]; - NoteColorSprite m_HoldTopCap[NUM_HOLD_TYPES][NUM_ACTIVE_TYPES]; - NoteColorSprite m_HoldBody[NUM_HOLD_TYPES][NUM_ACTIVE_TYPES]; - NoteColorSprite m_HoldBottomCap[NUM_HOLD_TYPES][NUM_ACTIVE_TYPES]; - NoteColorActor m_HoldTail[NUM_HOLD_TYPES][NUM_ACTIVE_TYPES]; + NoteColorActor m_HoldHead[NUM_HoldType][NUM_ActiveType]; + NoteColorSprite m_HoldTopCap[NUM_HoldType][NUM_ActiveType]; + NoteColorSprite m_HoldBody[NUM_HoldType][NUM_ActiveType]; + NoteColorSprite m_HoldBottomCap[NUM_HoldType][NUM_ActiveType]; + NoteColorActor m_HoldTail[NUM_HoldType][NUM_ActiveType]; float m_fYReverseOffsetPixels; }; diff --git a/stepmania/src/ScreenDemonstration.cpp b/stepmania/src/ScreenDemonstration.cpp index 3b2bc279c7..4151e2e4ef 100644 --- a/stepmania/src/ScreenDemonstration.cpp +++ b/stepmania/src/ScreenDemonstration.cpp @@ -34,7 +34,7 @@ void ScreenDemonstration::Init() FOREACH_CONST( RString, v, s ) { StyleType st = StringToStyleType( *s ); - ASSERT( st != STYLE_TYPE_INVALID ); + ASSERT( st != StyleType_Invalid ); vStyleTypeAllow.push_back( st ); }