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

naming cleanups

Browse Source
This commit is contained in:
Glenn Maynard
2006-09-26 21:05:49 +00:00
parent eb618a8160
commit 0b7b6b6f9f
3 changed files with 18 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/NoteDisplay.cpp
+4 -4
View File
@@ -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();
stepmania/src/NoteDisplay.h
+13 -11
View File
@@ -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;
};
stepmania/src/ScreenDemonstration.cpp
+1 -1
View File
@@ -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 );
}