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

Added metrics to show/hide ROULETTE and RANDOM

Browse Source
This commit is contained in:
Chris Danford
2003-03-13 23:58:30 +00:00
parent 8fbbda9e79
commit f65c3498c5
4 changed files with 15 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/Themes/default/metrics.ini
+2
View File
@@ -600,6 +600,8 @@ SectionColor5=0.0, 0.6, 0.6, 1
SectionColor6=0.0, 0.6, 0.2, 1 SectionColor6=0.0, 0.6, 0.2, 1
SectionColor7=0.8, 0.6, 0.0, 1 SectionColor7=0.8, 0.6, 0.0, 1
SongRealExtraColor=0.9,0.9,0,1 // yellow SongRealExtraColor=0.9,0.9,0,1 // yellow
ShowRoulette=1
ShowRandom=1
[LifeMeterBar] [LifeMeterBar]
MeterWidth=260 MeterWidth=260
stepmania/src/MusicBannerWheel.cpp
+2 -2
View File
@@ -29,8 +29,8 @@ enum
GOINGRIGHT GOINGRIGHT
}; };
#define DEFAULT_SCROLL_DIRECTION THEME->GetMetricI("Notes","DefaultScrollDirection") #define DEFAULT_SCROLL_DIRECTION THEME->GetMetricI("Notes","DefaultScrollDirection")
#define PREVIEWMUSICMODE THEME->GetMetricI("ScreenEz2SelectMusic","PreviewMusicMode") #define PREVIEWMUSICMODE THEME->GetMetricI("ScreenEz2SelectMusic","PreviewMusicMode")
MusicBannerWheel::MusicBannerWheel() MusicBannerWheel::MusicBannerWheel()
{ {
stepmania/src/MusicWheel.cpp
+11 -6
View File
@@ -40,6 +40,8 @@
#define SECTION_COLORS( i ) THEME->GetMetricC("MusicWheel",ssprintf("SectionColor%d",i+1)) #define SECTION_COLORS( i ) THEME->GetMetricC("MusicWheel",ssprintf("SectionColor%d",i+1))
#define DEFAULT_SCROLL_DIRECTION THEME->GetMetricI("Notes","DefaultScrollDirection") #define DEFAULT_SCROLL_DIRECTION THEME->GetMetricI("Notes","DefaultScrollDirection")
#define SONG_REAL_EXTRA_COLOR THEME->GetMetricC("MusicWheel","SongRealExtraColor") #define SONG_REAL_EXTRA_COLOR THEME->GetMetricC("MusicWheel","SongRealExtraColor")
#define SHOW_ROULETTE THEME->GetMetricB("MusicWheel","ShowRoulette")
#define SHOW_RANDOM THEME->GetMetricB("MusicWheel","ShowRandom")
const int MAX_WHEEL_SOUND_SPEED = 15; const int MAX_WHEEL_SOUND_SPEED = 15;
@@ -295,13 +297,14 @@ void MusicWheel::BuildWheelItemDatas( vector<WheelItemData> &arrayWheelItemDatas
{ {
unsigned i; unsigned i;
// Roulette is used only in arcade and battle // Roulette isn't a choice when selecting a course
if( so == SongSortOrder(SORT_ROULETTE) ) if( so == SongSortOrder(SORT_ROULETTE) )
{ {
switch( GAMESTATE->m_PlayMode ) switch( GAMESTATE->m_PlayMode )
{ {
case PLAY_MODE_ARCADE: case PLAY_MODE_NONSTOP:
case PLAY_MODE_BATTLE: case PLAY_MODE_ONI:
case PLAY_MODE_ENDLESS:
break; break;
default: default:
return; return;
@@ -360,7 +363,7 @@ void MusicWheel::BuildWheelItemDatas( vector<WheelItemData> &arrayWheelItemDatas
case SORT_GROUP: bUseSections = GAMESTATE->m_sPreferredGroup == GROUP_ALL_MUSIC; break; case SORT_GROUP: bUseSections = GAMESTATE->m_sPreferredGroup == GROUP_ALL_MUSIC; break;
case SORT_TITLE: bUseSections = true; break; case SORT_TITLE: bUseSections = true; break;
case SORT_ROULETTE: bUseSections = false; break; case SORT_ROULETTE: bUseSections = false; break;
default: ASSERT( false ); default: ASSERT( 0 );
} }
if( PREFSMAN->m_MusicWheelUsesSections == PrefsManager::NEVER || (so != SORT_TITLE && PREFSMAN->m_MusicWheelUsesSections == PrefsManager::ABC_ONLY )) if( PREFSMAN->m_MusicWheelUsesSections == PrefsManager::NEVER || (so != SORT_TITLE && PREFSMAN->m_MusicWheelUsesSections == PrefsManager::ABC_ONLY ))
@@ -409,8 +412,10 @@ void MusicWheel::BuildWheelItemDatas( vector<WheelItemData> &arrayWheelItemDatas
if( so != SORT_ROULETTE ) if( so != SORT_ROULETTE )
{ {
arrayWheelItemDatas.push_back( WheelItemData(TYPE_ROULETTE, NULL, "", NULL, RageColor(1,0,0,1)) ); if( SHOW_ROULETTE )
arrayWheelItemDatas.push_back( WheelItemData(TYPE_RANDOM, NULL, "", NULL, RageColor(1,0,0,1)) ); arrayWheelItemDatas.push_back( WheelItemData(TYPE_ROULETTE, NULL, "", NULL, RageColor(1,0,0,1)) );
if( SHOW_RANDOM )
arrayWheelItemDatas.push_back( WheelItemData(TYPE_RANDOM, NULL, "", NULL, RageColor(1,0,0,1)) );
} }
// HACK: Add extra stage item if it isn't already present on the music wheel // HACK: Add extra stage item if it isn't already present on the music wheel
stepmania/src/MusicWheelItem.h
-17
View File
@@ -11,23 +11,6 @@
----------------------------------------------------------------------------- -----------------------------------------------------------------------------
*/ */
//#include "Sprite.h"
//#include "song.h"
//#include "ActorFrame.h"
//#include "BitmapText.h"
//#include "Quad.h"
//#include "TextBanner.h"
//#include "RandomSample.h"
//#include "SmallGradeDisplay.h"
//#include "GameConstantsAndTypes.h"
//#include "MusicSortDisplay.h"
//#include "WheelNotifyIcon.h"
//#include "Screen.h" // for ScreenMessage
//#include "ScoreDisplayNormal.h"
//#include "ScrollBar.h"
//#include "Course.h"
//#include "RageTimer.h"
enum WheelItemType { TYPE_SECTION, TYPE_SONG, TYPE_ROULETTE, TYPE_RANDOM, TYPE_COURSE }; enum WheelItemType { TYPE_SECTION, TYPE_SONG, TYPE_ROULETTE, TYPE_RANDOM, TYPE_COURSE };