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

Changed NotesLoaderBMS to not crash when trying to set StepsTypeStr for an unrecognized StepsType. Removed ConfOption for ShowSelectGroup from ScreenOptionsMasterPrefs because the preference does not exist.

Browse Source
This commit is contained in:
Kyzentun Keeslala
2015-10-23 20:42:49 -06:00
parent 7ed09304d0
commit da2db95365
2 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/NotesLoaderBMS.cpp
+8 -1
View File
@@ -923,7 +923,14 @@ void BMSChartReader::CalculateStepsType()
{ {
nonEmptyTracksCount = nonEmptyTracks.size(); nonEmptyTracksCount = nonEmptyTracks.size();
out->m_StepsType = DetermineStepsType(); out->m_StepsType = DetermineStepsType();
out->m_StepsTypeStr = GAMEMAN->GetStepsTypeInfo(out->m_StepsType).szName; if(out->m_StepsType == StepsType_Invalid)
{
out->m_StepsTypeStr = "BMS_loaded_invalid_stepstype";
}
else
{
out->m_StepsTypeStr = GAMEMAN->GetStepsTypeInfo(out->m_StepsType).szName;
}
} }
enum BmsRawChannel enum BmsRawChannel
src/ScreenOptionsMasterPrefs.cpp
-1
View File
@@ -726,7 +726,6 @@ static void InitializeConfOptions()
ADD( ConfOption( "ShowInstructions", MovePref<bool>, "Skip","Show") ); ADD( ConfOption( "ShowInstructions", MovePref<bool>, "Skip","Show") );
ADD( ConfOption( "ShowCaution", MovePref<bool>, "Skip","Show") ); ADD( ConfOption( "ShowCaution", MovePref<bool>, "Skip","Show") );
ADD( ConfOption( "DancePointsForOni", MovePref<bool>, "Percent","Dance Points") ); ADD( ConfOption( "DancePointsForOni", MovePref<bool>, "Percent","Dance Points") );
ADD( ConfOption( "ShowSelectGroup", MovePref<bool>, "All Music","Choose") );
ADD( ConfOption( "MusicWheelUsesSections", MovePref<MusicWheelUsesSections>, "Never","Always","Title Only") ); ADD( ConfOption( "MusicWheelUsesSections", MovePref<MusicWheelUsesSections>, "Never","Always","Title Only") );
ADD( ConfOption( "CourseSortOrder", MovePref<CourseSortOrders>, "Num Songs","Average Feet","Total Feet","Ranking") ); ADD( ConfOption( "CourseSortOrder", MovePref<CourseSortOrders>, "Num Songs","Average Feet","Total Feet","Ranking") );
ADD( ConfOption( "MoveRandomToEnd", MovePref<bool>, "No","Yes") ); ADD( ConfOption( "MoveRandomToEnd", MovePref<bool>, "No","Yes") );