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

Revert. Reloading is a hack and shouldn't be part of the API.

Browse Source
This commit is contained in:
Steve Checkoway
2006-03-18 13:26:01 +00:00
parent dd3206c4fc
commit c4835e0adb
7 changed files with 17 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/ScreenOptionsManageCourses.cpp
+9 -24
View File
@@ -163,11 +163,16 @@ void ScreenOptionsManageCourses::Init()
EDIT_MODE.Load( m_sName,"EditMode" );
GAMESTATE->m_MasterPlayerNumber = GAMESTATE->GetFirstHumanPlayer();
RebuildOptionRows();
}
void ScreenOptionsManageCourses::RebuildOptionRows()
void ScreenOptionsManageCourses::BeginScreen()
{
if( GAMESTATE->m_stEdit == STEPS_TYPE_INVALID ||
GAMESTATE->m_cdEdit == DIFFICULTY_INVALID )
{
SetNextCombination();
}
vector<OptionRowHandler*> vHands;
int iIndex = 0;
@@ -235,20 +240,7 @@ void ScreenOptionsManageCourses::RebuildOptionRows()
}
ScreenOptions::InitMenu( vHands );
m_bForceRebuild = false;
}
void ScreenOptionsManageCourses::BeginScreen()
{
if( GAMESTATE->m_stEdit == STEPS_TYPE_INVALID ||
GAMESTATE->m_cdEdit == DIFFICULTY_INVALID )
{
SetNextCombination();
}
if( m_bForceRebuild )
RebuildOptionRows();
ScreenOptions::BeginScreen();
// select the last chosen course
@@ -265,12 +257,6 @@ void ScreenOptionsManageCourses::BeginScreen()
AfterChangeRow( GAMESTATE->m_MasterPlayerNumber );
}
void ScreenOptionsManageCourses::ReloadScreen()
{
m_bForceRebuild = true;
ScreenOptionsEditCourseSubMenu::ReloadScreen();
}
static LocalizedString COURSE_WILL_BE_LOST ( "ScreenOptionsManageCourses", "This course will be lost permanently." );
static LocalizedString CONTINUE_WITH_DELETE ( "ScreenOptionsManageCourses", "Continue with delete?" );
static LocalizedString ENTER_COURSE_NAME ( "ScreenOptionsManageCourses", "Enter a name for the course." );
@@ -288,7 +274,7 @@ void ScreenOptionsManageCourses::HandleScreenMessage( const ScreenMessage SM )
if( !pCourse->IsAnEdit() )
FILEMAN->Remove( pCourse->GetCacheFilePath() );
delete pCourse;
ReloadScreen();
SCREENMAN->SetNewScreen( this->m_sName ); // reload
}
else if( SM == SM_Failure )
{
@@ -340,7 +326,6 @@ void ScreenOptionsManageCourses::HandleScreenMessage( const ScreenMessage SM )
WriteCourse();
RefreshTrail();
m_bForceRebuild = true;
this->HandleScreenMessage( SM_GoToNextScreen );
}
}
@@ -362,7 +347,7 @@ void ScreenOptionsManageCourses::HandleScreenMessage( const ScreenMessage SM )
pCourse->m_sPath = sDir + sNewName + sExt;
pCourse->m_sMainTitle = sNewName;
WriteCourse();
ReloadScreen();
SCREENMAN->SetNewScreen( this->m_sName ); // reload
}
}
else if( SM == SM_BackFromContextMenu )