From 8df33321d36c7048ffc1fdefb0aa1ece98512f9c Mon Sep 17 00:00:00 2001 From: Chris Danford Date: Fri, 26 Oct 2007 07:40:54 +0000 Subject: [PATCH] remove WorkoutStepsType --- stepmania/src/ScreenOptionsEditPlaylist.cpp | 6 ++-- stepmania/src/ScreenOptionsEditWorkout.cpp | 34 ++------------------ stepmania/src/ScreenOptionsReviewWorkout.cpp | 13 -------- stepmania/src/Workout.cpp | 20 ------------ stepmania/src/Workout.h | 12 ------- 5 files changed, 6 insertions(+), 79 deletions(-) diff --git a/stepmania/src/ScreenOptionsEditPlaylist.cpp b/stepmania/src/ScreenOptionsEditPlaylist.cpp index 8286e2cad9..02e0e38ac7 100644 --- a/stepmania/src/ScreenOptionsEditPlaylist.cpp +++ b/stepmania/src/ScreenOptionsEditPlaylist.cpp @@ -155,14 +155,14 @@ void ScreenOptionsEditPlaylist::ProcessMenuStart( const InputEventPlus &input ) ScreenOptions::ProcessMenuStart( input ); } -RString GetEditPlaylistSelectedSongGenreText( int iColumnIndex ) +RString GetEditPlaylistSelectedSongGenreText( int iColumnIndex, int iMaxPerCol ) { vector vsSongGenres; vsSongGenres.push_back( g_sSongGenre ); vector vpSongGenreSongs; WORKOUTMAN->GetWorkoutSongsForGenres( vsSongGenres, vpSongGenreSongs ); - const int iSongPerCoumn = 20; + const int iSongPerCoumn = iMaxPerCol; vector vs; for( int i=iColumnIndex*iSongPerCoumn; i<(iColumnIndex+1)*iSongPerCoumn && i<(int)vpSongGenreSongs.size(); i++ ) { @@ -179,7 +179,7 @@ RString GetEditPlaylistSelectedSongGenreText( int iColumnIndex ) #include "LuaManager.h" LuaFunction( GetEditPlaylistSelectedSongGenre, g_sSongGenre ); -LuaFunction( GetEditPlaylistSelectedSongGenreText, GetEditPlaylistSelectedSongGenreText(IArg(1)) ); +LuaFunction( GetEditPlaylistSelectedSongGenreText, GetEditPlaylistSelectedSongGenreText(IArg(1),IArg(2)) ); /* diff --git a/stepmania/src/ScreenOptionsEditWorkout.cpp b/stepmania/src/ScreenOptionsEditWorkout.cpp index 34d6b30be0..5eb5a77ddd 100644 --- a/stepmania/src/ScreenOptionsEditWorkout.cpp +++ b/stepmania/src/ScreenOptionsEditWorkout.cpp @@ -18,18 +18,14 @@ enum WorkoutDetailsRow WorkoutDetailsRow_WorkoutProgram, WorkoutDetailsRow_Minutes, WorkoutDetailsRow_Meter, - //WorkoutDetailsRow_SongGenre, - WorkoutDetailsRow_WorkoutStepsType, NUM_WorkoutDetailsRow }; const MenuRowDef g_MenuRows[] = { - MenuRowDef( -1, "Workout Program", true, EditMode_Practice, true, false, 0, NULL ), - MenuRowDef( -1, "Minutes", true, EditMode_Practice, true, false, 0, NULL ), - MenuRowDef( -1, "Difficulty", true, EditMode_Practice, true, false, 0, NULL ), - //MenuRowDef( -1, "Song Genre", true, EditMode_Practice, true, false, 0, NULL ), - MenuRowDef( -1, "Workout Steps Type", true, EditMode_Practice, true, false, 0, NULL ), + MenuRowDef( -1, "Workout Program", true, EditMode_Practice, true, false, 0, NULL ), + MenuRowDef( -1, "Workout Minutes", true, EditMode_Practice, true, false, 0, NULL ), + MenuRowDef( -1, "Workout Difficulty", true, EditMode_Practice, true, false, 0, NULL ), }; REGISTER_SCREEN_CLASS( ScreenOptionsEditWorkout ); @@ -75,18 +71,6 @@ void ScreenOptionsEditWorkout::BeginScreen() for( int i=MIN_METER; i<=MAX_METER; i++ ) pHand->m_Def.m_vsChoices.push_back( MakeMeterString(i) ); break; - //case WorkoutDetailsRow_SongGenre: - // { - // vector vs; - // SongUtil::GetAllSongGenres( vs ); - // FOREACH_CONST( RString, vs, s ) - // pHand->m_Def.m_vsChoices.push_back( *s ); - // } - // break; - case WorkoutDetailsRow_WorkoutStepsType: - FOREACH_ENUM( WorkoutStepsType, i ) - pHand->m_Def.m_vsChoices.push_back( WorkoutStepsTypeToLocalizedString(i) ); - break; } pHand->m_Def.m_bExportOnChange = true; @@ -118,12 +102,6 @@ void ScreenOptionsEditWorkout::ImportOptions( int iRow, const vectorm_pCurWorkout->m_iAverageMeter) ); break; - //case WorkoutDetailsRow_SongGenre: - // row.SetOneSharedSelectionIfPresent( g_Workout.m_sSongGenre ); - // break; - case WorkoutDetailsRow_WorkoutStepsType: - row.SetOneSharedSelection( WORKOUTMAN->m_pCurWorkout->m_WorkoutStepsType ); - break; } } @@ -150,12 +128,6 @@ void ScreenOptionsEditWorkout::ExportOptions( int iRow, const vectorm_pCurWorkout->m_iAverageMeter = iIndex + MIN_METER; break; - //case WorkoutDetailsRow_SongGenre: - // g_Workout.m_sSongGenre = sValue; - // break; - case WorkoutDetailsRow_WorkoutStepsType: - WORKOUTMAN->m_pCurWorkout->m_WorkoutStepsType = (WorkoutStepsType)iIndex; - break; } } diff --git a/stepmania/src/ScreenOptionsReviewWorkout.cpp b/stepmania/src/ScreenOptionsReviewWorkout.cpp index 6bbcbfbde9..cf9b7a268b 100644 --- a/stepmania/src/ScreenOptionsReviewWorkout.cpp +++ b/stepmania/src/ScreenOptionsReviewWorkout.cpp @@ -105,19 +105,6 @@ void ScreenOptionsReviewWorkout::HandleScreenMessage( const ScreenMessage SM ) ASSERT( pTrail ); GAMESTATE->m_pCurTrail[PLAYER_1].Set( pTrail ); - switch( pWorkout->m_WorkoutStepsType ) - { - DEFAULT_FAIL(pWorkout->m_WorkoutStepsType); - case WorkoutStepsType_NormalSteps: - PO_GROUP_ASSIGN_N( GAMESTATE->m_pPlayerState[PLAYER_1]->m_PlayerOptions, ModsLevel_Stage, m_bTransforms, PlayerOptions::TRANSFORM_LITTLE, false ); - PO_GROUP_ASSIGN_N( GAMESTATE->m_pPlayerState[PLAYER_1]->m_PlayerOptions, ModsLevel_Stage, m_bTransforms, PlayerOptions::TRANSFORM_NOHANDS, false ); - break; - case WorkoutStepsType_WorkoutSteps: - PO_GROUP_ASSIGN_N( GAMESTATE->m_pPlayerState[PLAYER_1]->m_PlayerOptions, ModsLevel_Stage, m_bTransforms, PlayerOptions::TRANSFORM_LITTLE, true ); - PO_GROUP_ASSIGN_N( GAMESTATE->m_pPlayerState[PLAYER_1]->m_PlayerOptions, ModsLevel_Stage, m_bTransforms, PlayerOptions::TRANSFORM_NOHANDS, true ); - break; - } - GAMESTATE->m_PlayMode.Set( PLAY_MODE_ENDLESS ); GAMESTATE->m_bSideIsJoined[0] = true; GAMESTATE->SetCurrentStyle( pStyle ); diff --git a/stepmania/src/Workout.cpp b/stepmania/src/Workout.cpp index d395e13112..9cada3c021 100644 --- a/stepmania/src/Workout.cpp +++ b/stepmania/src/Workout.cpp @@ -22,23 +22,11 @@ StringToX( WorkoutProgram ); XToLocalizedString( WorkoutProgram ); -static const char *WorkoutStepsTypeNames[] = { - "NormalSteps", - "WorkoutSteps" -}; -XToString( WorkoutStepsType ); -StringToX( WorkoutStepsType ); -XToLocalizedString( WorkoutStepsType ); -LuaXType( WorkoutStepsType ); -LuaFunction( WorkoutStepsTypeToLocalizedString, WorkoutStepsTypeToLocalizedString(Enum::Check(L, 1)) ); - - Workout::Workout() { m_WorkoutProgram = (WorkoutProgram)0; m_iMinutes = 10; m_iAverageMeter = 3; - m_WorkoutStepsType = (WorkoutStepsType)0; } int Workout::GetEstimatedNumSongs() const @@ -178,11 +166,6 @@ bool Workout::LoadFromFile( RString sFile ) xml.GetChildValue("AverageMeter",m_iAverageMeter); CLAMP( m_iAverageMeter, MIN_METER, MAX_METER ); - xml.GetChildValue("WorkoutStepsType",s); - m_WorkoutStepsType = StringToWorkoutStepsType( s ); - if( m_WorkoutStepsType == WorkoutStepsType_Invalid ) - m_WorkoutStepsType = (WorkoutStepsType)0; - XNode *songGenres = xml.GetChild("SongGenres"); if( songGenres ) { @@ -209,7 +192,6 @@ bool Workout::SaveToFile( RString sFile ) xml.AppendChild( "WorkoutProgram", WorkoutProgramToString(m_WorkoutProgram) ); xml.AppendChild( "Minutes", m_iMinutes ); xml.AppendChild( "AverageMeter", m_iAverageMeter ); - xml.AppendChild( "WorkoutStepsType", WorkoutStepsTypeToString(m_WorkoutStepsType) ); XNode *songGenres = xml.AppendChild("SongGenres"); FOREACH_CONST( RString, m_vsSongGenres, s ) @@ -229,14 +211,12 @@ public: DEFINE_METHOD( GetName, m_sName ) DEFINE_METHOD( GetMinutes, m_iMinutes ) DEFINE_METHOD( GetEstimatedNumSongs, GetEstimatedNumSongs() ) - DEFINE_METHOD( GetWorkoutStepsType, m_WorkoutStepsType ) LunaWorkout() { ADD_METHOD( GetName ); ADD_METHOD( GetMinutes ); ADD_METHOD( GetEstimatedNumSongs ); - ADD_METHOD( GetWorkoutStepsType ); } }; diff --git a/stepmania/src/Workout.h b/stepmania/src/Workout.h index 4151b3a9fd..4e5cef5313 100644 --- a/stepmania/src/Workout.h +++ b/stepmania/src/Workout.h @@ -18,17 +18,6 @@ const RString& WorkoutProgramToLocalizedString( WorkoutProgram i ); const RString& WorkoutProgramToLocalizedString( WorkoutProgram i ); WorkoutProgram StringToWorkoutProgram( const RString& str ); -enum WorkoutStepsType -{ - WorkoutStepsType_NormalSteps, - WorkoutStepsType_WorkoutSteps, - NUM_WorkoutStepsType, - WorkoutStepsType_Invalid -}; -const RString& WorkoutStepsTypeToLocalizedString( WorkoutStepsType i ); -WorkoutStepsType StringToWorkoutStepsType( const RString& str ); -LuaDeclareType( WorkoutStepsType ); - const int MIN_WORKOUT_MINUTES = 4; const int MAX_WORKOUT_MINUTES = 90; @@ -49,7 +38,6 @@ public: WorkoutProgram m_WorkoutProgram; int m_iMinutes; int m_iAverageMeter; - WorkoutStepsType m_WorkoutStepsType; vector m_vsSongGenres; int GetEstimatedNumSongs() const;