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

fix Workout with non dance-single Styles

Browse Source
This commit is contained in:
Chris Danford
2007-10-19 08:59:25 +00:00
parent 5fa0000bec
commit dd4c27bc0f
1 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/ScreenOptionsReviewWorkout.cpp
+9 -2
View File
@@ -17,6 +17,7 @@
#include "Profile.h" #include "Profile.h"
#include "ScreenPrompt.h" #include "ScreenPrompt.h"
#include "PlayerState.h" #include "PlayerState.h"
#include "Style.h"
enum ReviewWorkoutRow enum ReviewWorkoutRow
{ {
@@ -96,8 +97,14 @@ void ScreenOptionsReviewWorkout::HandleScreenMessage( const ScreenMessage SM )
{ {
Workout *pWorkout = WORKOUTMAN->m_pCurWorkout; Workout *pWorkout = WORKOUTMAN->m_pCurWorkout;
pWorkout->GenerateCourse( *WORKOUTMAN->m_pTempCourse ); pWorkout->GenerateCourse( *WORKOUTMAN->m_pTempCourse );
GAMESTATE->m_pCurSong.Set( NULL ); // CurSong will be set if we back out. Set it back to NULL so that ScreenStage won't show the last song.
GAMESTATE->m_pCurCourse.Set( WORKOUTMAN->m_pTempCourse ); GAMESTATE->m_pCurCourse.Set( WORKOUTMAN->m_pTempCourse );
GAMESTATE->m_pCurTrail[PLAYER_1].Set( GAMESTATE->m_pCurCourse->GetTrail(STEPS_TYPE_DANCE_SINGLE) ); const Style *pStyle = GAMEMAN->GameAndStringToStyle(GAMESTATE->m_pCurGame,"single");
StepsType st = pStyle->m_StepsType;
Trail *pTrail = GAMESTATE->m_pCurCourse->GetTrail( st );
ASSERT( pTrail );
GAMESTATE->m_pCurTrail[PLAYER_1].Set( pTrail );
switch( pWorkout->m_WorkoutStepsType ) switch( pWorkout->m_WorkoutStepsType )
{ {
DEFAULT_FAIL(pWorkout->m_WorkoutStepsType); DEFAULT_FAIL(pWorkout->m_WorkoutStepsType);
@@ -113,7 +120,7 @@ void ScreenOptionsReviewWorkout::HandleScreenMessage( const ScreenMessage SM )
GAMESTATE->m_PlayMode.Set( PLAY_MODE_ENDLESS ); GAMESTATE->m_PlayMode.Set( PLAY_MODE_ENDLESS );
GAMESTATE->m_bSideIsJoined[0] = true; GAMESTATE->m_bSideIsJoined[0] = true;
GAMESTATE->SetCurrentStyle( GAMEMAN->GameAndStringToStyle(GAMESTATE->m_pCurGame,"single") ); GAMESTATE->SetCurrentStyle( pStyle );
PROFILEMAN->GetProfile(ProfileSlot_Player1)->m_GoalType = GoalType_Time; PROFILEMAN->GetProfile(ProfileSlot_Player1)->m_GoalType = GoalType_Time;
PROFILEMAN->GetProfile(ProfileSlot_Player1)->m_iGoalSeconds = pWorkout->m_iMinutes * 60; PROFILEMAN->GetProfile(ProfileSlot_Player1)->m_iGoalSeconds = pWorkout->m_iMinutes * 60;