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

Metric to hide the easy song flag on the MusicWheel (fix when using a transparent graphic for this flag and the song has multiple flags; this prevents the flag cycle from flashing an empty flag)

Browse Source
This commit is contained in:
Mike Hawkins
2008-06-07 22:47:53 +00:00
parent a799ce1b36
commit 5eb2e83d68
3 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/Themes/default/metrics.ini
+1
View File
@@ -1873,6 +1873,7 @@ ChoiceEasyMeter="sort,EasyMeter"
ChoiceMediumMeter="sort,MediumMeter" ChoiceMediumMeter="sort,MediumMeter"
ChoiceHardMeter="sort,HardMeter" ChoiceHardMeter="sort,HardMeter"
ChoiceLength="sort,Length" ChoiceLength="sort,Length"
UseEasyMarkerFlag=false
[RoomWheel] [RoomWheel]
Fallback="MusicWheel" Fallback="MusicWheel"
stepmania/src/MusicWheel.cpp
+2 -1
View File
@@ -75,6 +75,7 @@ void MusicWheel::Load( RString sType )
MOST_PLAYED_SONGS_TO_SHOW .Load(sType,"MostPlayedSongsToShow"); MOST_PLAYED_SONGS_TO_SHOW .Load(sType,"MostPlayedSongsToShow");
MODE_MENU_CHOICE_NAMES .Load(sType,"ModeMenuChoiceNames"); MODE_MENU_CHOICE_NAMES .Load(sType,"ModeMenuChoiceNames");
SORT_ORDERS .Load(sType,"SortOrders"); SORT_ORDERS .Load(sType,"SortOrders");
SHOW_EASY_FLAG .Load(sType,"UseEasyMarkerFlag");
vector<RString> vsModeChoiceNames; vector<RString> vsModeChoiceNames;
split( MODE_MENU_CHOICE_NAMES, ",", vsModeChoiceNames ); split( MODE_MENU_CHOICE_NAMES, ",", vsModeChoiceNames );
CHOICE .Load(sType,CHOICE_NAME,vsModeChoiceNames); CHOICE .Load(sType,CHOICE_NAME,vsModeChoiceNames);
@@ -693,7 +694,7 @@ void MusicWheel::BuildWheelItemDatas( vector<MusicWheelItemData *> &arrayWheelIt
MusicWheelItemData& WID = *arrayWheelItemDatas[i]; MusicWheelItemData& WID = *arrayWheelItemDatas[i];
if( WID.m_pSong != NULL ) if( WID.m_pSong != NULL )
{ {
WID.m_Flags.bHasBeginnerOr1Meter = WID.m_pSong->IsEasy( GAMESTATE->GetCurrentStyle()->m_StepsType ); WID.m_Flags.bHasBeginnerOr1Meter = WID.m_pSong->IsEasy( GAMESTATE->GetCurrentStyle()->m_StepsType ) && SHOW_EASY_FLAG;
WID.m_Flags.bEdits = WID.m_pSong->HasEdits( GAMESTATE->GetCurrentStyle()->m_StepsType ); WID.m_Flags.bEdits = WID.m_pSong->HasEdits( GAMESTATE->GetCurrentStyle()->m_StepsType );
WID.m_Flags.iStagesForSong = GameState::GetNumStagesMultiplierForSong( WID.m_pSong ); WID.m_Flags.iStagesForSong = GameState::GetNumStagesMultiplierForSong( WID.m_pSong );
} }
stepmania/src/MusicWheel.h
+1
View File
@@ -79,6 +79,7 @@ protected:
ThemeMetricMap<RString> CHOICE; ThemeMetricMap<RString> CHOICE;
ThemeMetric1D<RageColor> SECTION_COLORS; ThemeMetric1D<RageColor> SECTION_COLORS;
ThemeMetric<LuaReference> SORT_ORDERS; ThemeMetric<LuaReference> SORT_ORDERS;
ThemeMetric<bool> SHOW_EASY_FLAG;
}; };
#endif #endif