From 39966292642d266d9462891dad46d5985e1cb691 Mon Sep 17 00:00:00 2001 From: Steve Checkoway Date: Tue, 21 Feb 2006 12:35:17 +0000 Subject: [PATCH] Set the master player number. (Maybe this should just be reverted to use PLAYER_1.) --- stepmania/src/ScreenOptionsManageCourses.cpp | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/stepmania/src/ScreenOptionsManageCourses.cpp b/stepmania/src/ScreenOptionsManageCourses.cpp index ed7c74675f..d39893c5b3 100644 --- a/stepmania/src/ScreenOptionsManageCourses.cpp +++ b/stepmania/src/ScreenOptionsManageCourses.cpp @@ -52,6 +52,9 @@ static void SetNextCombination() GAMESTATE->m_stEdit.Set( curVal.st ); GAMESTATE->m_cdEdit.Set( curVal.cd ); + // XXX Testing. + SCREENMAN->SystemMessage( ssprintf("%s, %s", GAMEMAN->StepsTypeToString(curVal.st).c_str(), + CourseDifficultyToString(curVal.cd).c_str()) ); RefreshTrail(); } @@ -131,6 +134,7 @@ void ScreenOptionsManageCourses::Init() ScreenOptionsEditCourseSubMenu::Init(); EDIT_MODE.Load( m_sName,"EditMode" ); + GAMESTATE->m_MasterPlayerNumber = PLAYER_1; } void ScreenOptionsManageCourses::BeginScreen() @@ -322,7 +326,7 @@ void ScreenOptionsManageCourses::HandleScreenMessage( const ScreenMessage SM ) void ScreenOptionsManageCourses::AfterChangeRow( PlayerNumber pn ) { Course *pCourse = GetCourseWithFocus(); - Trail *pTrail = pCourse ? pCourse->GetTrail( STEPS_TYPE_DANCE_SINGLE ) : NULL; + Trail *pTrail = pCourse ? pCourse->GetTrail( GAMESTATE->m_stEdit, GAMESTATE->m_cdEdit ) : NULL; GAMESTATE->m_pCurCourse.Set( pCourse ); GAMESTATE->m_pCurTrail[GAMESTATE->m_MasterPlayerNumber].Set( pTrail );