From 80e5e985c1feac30d119a999930eee609df0b57d Mon Sep 17 00:00:00 2001 From: AJ Kelly Date: Mon, 19 Apr 2010 00:19:25 -0500 Subject: [PATCH] Allow MusicWheelItem Random and Portal to have different graphics from Roulette. --- .../Graphics/MusicWheelItem Portal ColorPart.redir | 1 + .../Graphics/MusicWheelItem Portal NormalPart.redir | 1 + .../Graphics/MusicWheelItem Random ColorPart.redir | 1 + .../Graphics/MusicWheelItem Random NormalPart.redir | 1 + src/MusicWheelItem.cpp | 6 ++++-- src/MusicWheelItem.h | 2 ++ 6 files changed, 10 insertions(+), 2 deletions(-) create mode 100644 Themes/_fallback/Graphics/MusicWheelItem Portal ColorPart.redir create mode 100644 Themes/_fallback/Graphics/MusicWheelItem Portal NormalPart.redir create mode 100644 Themes/_fallback/Graphics/MusicWheelItem Random ColorPart.redir create mode 100644 Themes/_fallback/Graphics/MusicWheelItem Random NormalPart.redir diff --git a/Themes/_fallback/Graphics/MusicWheelItem Portal ColorPart.redir b/Themes/_fallback/Graphics/MusicWheelItem Portal ColorPart.redir new file mode 100644 index 0000000000..04b2ead777 --- /dev/null +++ b/Themes/_fallback/Graphics/MusicWheelItem Portal ColorPart.redir @@ -0,0 +1 @@ +_blank \ No newline at end of file diff --git a/Themes/_fallback/Graphics/MusicWheelItem Portal NormalPart.redir b/Themes/_fallback/Graphics/MusicWheelItem Portal NormalPart.redir new file mode 100644 index 0000000000..04b2ead777 --- /dev/null +++ b/Themes/_fallback/Graphics/MusicWheelItem Portal NormalPart.redir @@ -0,0 +1 @@ +_blank \ No newline at end of file diff --git a/Themes/_fallback/Graphics/MusicWheelItem Random ColorPart.redir b/Themes/_fallback/Graphics/MusicWheelItem Random ColorPart.redir new file mode 100644 index 0000000000..04b2ead777 --- /dev/null +++ b/Themes/_fallback/Graphics/MusicWheelItem Random ColorPart.redir @@ -0,0 +1 @@ +_blank \ No newline at end of file diff --git a/Themes/_fallback/Graphics/MusicWheelItem Random NormalPart.redir b/Themes/_fallback/Graphics/MusicWheelItem Random NormalPart.redir new file mode 100644 index 0000000000..04b2ead777 --- /dev/null +++ b/Themes/_fallback/Graphics/MusicWheelItem Random NormalPart.redir @@ -0,0 +1 @@ +_blank \ No newline at end of file diff --git a/src/MusicWheelItem.cpp b/src/MusicWheelItem.cpp index 2199be4137..7dcf3eff54 100644 --- a/src/MusicWheelItem.cpp +++ b/src/MusicWheelItem.cpp @@ -27,6 +27,8 @@ static const char *MusicWheelItemTypeNames[] = { "Course", "Sort", "Mode", + "Random", + "Portal", }; XToString( MusicWheelItemType ); @@ -229,11 +231,11 @@ void MusicWheelItem::LoadFromWheelItemData( const WheelItemBaseData *pData, int break; case TYPE_RANDOM: sDisplayName = THEME->GetString("MusicWheel","Random"); - type = MusicWheelItemType_Roulette; + type = MusicWheelItemType_Random; break; case TYPE_PORTAL: sDisplayName = THEME->GetString("MusicWheel","Portal"); - type = MusicWheelItemType_Roulette; + type = MusicWheelItemType_Portal; break; } diff --git a/src/MusicWheelItem.h b/src/MusicWheelItem.h index f3317d9aaf..eee58b2e88 100644 --- a/src/MusicWheelItem.h +++ b/src/MusicWheelItem.h @@ -27,6 +27,8 @@ enum MusicWheelItemType MusicWheelItemType_Course, MusicWheelItemType_Sort, MusicWheelItemType_Mode, + MusicWheelItemType_Random, + MusicWheelItemType_Portal, NUM_MusicWheelItemType, MusicWheelItemType_Invalid, };