naming cleanup

This commit is contained in:
Chris Danford
2005-10-08 16:36:14 +00:00
parent 74788af655
commit 0b808c6685
2 changed files with 8 additions and 8 deletions
+2 -2
View File
@@ -282,7 +282,7 @@ const AutoJoyMapping g_AutoJoyMappings[] =
{ {
"dance", "dance",
"Dance ", //Notice extra space at end "Dance ", //Notice extra space at end
"LevelSix USB Pad (DDR638)", "LevelSix USB Pad (DDR638)", // "DDR638" is the model number of the pad
{ {
{ 0, JOY_BUTTON_1, DANCE_BUTTON_UP, false }, { 0, JOY_BUTTON_1, DANCE_BUTTON_UP, false },
{ 0, JOY_BUTTON_2, DANCE_BUTTON_DOWN, false }, { 0, JOY_BUTTON_2, DANCE_BUTTON_DOWN, false },
@@ -339,7 +339,7 @@ const AutoJoyMapping g_AutoJoyMappings[] =
{ {
"techno", "techno",
"Dance ", //Notice the extra space at end "Dance ", //Notice the extra space at end
"LevelSix USB Pad (DDR638)", "LevelSix USB Pad (DDR638)", // "DDR638" is the model number of the pad
{ {
{ 0, JOY_BUTTON_1, TECHNO_BUTTON_UP, false }, { 0, JOY_BUTTON_1, TECHNO_BUTTON_UP, false },
{ 0, JOY_BUTTON_2, TECHNO_BUTTON_DOWN, false }, { 0, JOY_BUTTON_2, TECHNO_BUTTON_DOWN, false },
+6 -6
View File
@@ -11,8 +11,8 @@
enum BANNER_PREFS_TYPES enum BANNER_PREFS_TYPES
{ {
BANNERPREFS_DDRFLAT=0, BANNERPREFS_FLAT=0,
BANNERPREFS_DDRROT, BANNERPREFS_ROT,
BANNERPREFS_EZ2, BANNERPREFS_EZ2,
BANNERPREFS_PUMP, BANNERPREFS_PUMP,
BANNERPREFS_PARA BANNERPREFS_PARA
@@ -31,7 +31,7 @@ enum BANNER_PREFS_TYPES
#define SPRITE_TYPE_SPRITE 0 #define SPRITE_TYPE_SPRITE 0
#define SPRITE_TYPE_CROPPEDSPRITE 1 #define SPRITE_TYPE_CROPPEDSPRITE 1
#define DDRROT_ROTATION 315 #define ROT_ROTATION 315
const int DEFAULT_VISIBLE_ELEMENTS = 9; const int DEFAULT_VISIBLE_ELEMENTS = 9;
const int DEFAULT_SPACING = 300; const int DEFAULT_SPACING = 300;
@@ -398,7 +398,7 @@ void ScrollingList::Replace(CString sGraphicPath, int ElementNumber)
{ {
Sprite* pNewCSprite = new Sprite; Sprite* pNewCSprite = new Sprite;
pNewCSprite->Load( sGraphicPath ); pNewCSprite->Load( sGraphicPath );
if(m_iBannerPrefs == BANNERPREFS_DDRFLAT) if(m_iBannerPrefs == BANNERPREFS_FLAT)
{ {
// ScaleToClipped should detect rotated banner files and correct // ScaleToClipped should detect rotated banner files and correct
// accordingly. If there's a case I didn't think about, feel free // accordingly. If there's a case I didn't think about, feel free
@@ -414,10 +414,10 @@ void ScrollingList::Replace(CString sGraphicPath, int ElementNumber)
pNewCSprite->ScaleToClipped( BANNER_WIDTH, BANNER_HEIGHT ); pNewCSprite->ScaleToClipped( BANNER_WIDTH, BANNER_HEIGHT );
} }
else if(m_iBannerPrefs == BANNERPREFS_DDRROT) else if(m_iBannerPrefs == BANNERPREFS_ROT)
{ {
pNewCSprite->ScaleToClipped( BANNER_WIDTH, BANNER_HEIGHT ); pNewCSprite->ScaleToClipped( BANNER_WIDTH, BANNER_HEIGHT );
pNewCSprite->SetRotationZ( DDRROT_ROTATION ); pNewCSprite->SetRotationZ( ROT_ROTATION );
} }
else if(m_iBannerPrefs == BANNERPREFS_EZ2) else if(m_iBannerPrefs == BANNERPREFS_EZ2)
{ {