cleanup: override SM_GoToNextScreen instead of having a different path

This commit is contained in:
Glenn Maynard
2005-07-12 06:33:00 +00:00
parent 57cef3fb5a
commit c570457834
20 changed files with 260 additions and 267 deletions
+26 -25
View File
@@ -144,34 +144,35 @@ void ScreenPlayerOptions::HandleScreenMessage( const ScreenMessage SM )
}
}
if( SM == SM_GoToNextScreen )
{
if( SCREENMAN->IsStackedScreen(this) )
{
SCREENMAN->PopTopScreen( SM_BackFromPlayerOptions );
}
else
{
SCREENMAN->SetNewScreen( NEXT_SCREEN );
}
return;
}
else if( SM == SM_GoToPrevScreen )
{
if( SCREENMAN->IsStackedScreen(this) )
{
SCREENMAN->PopTopScreen( SM_BackFromPlayerOptions );
}
else
{
SCREENMAN->DeletePreparedScreens();
SCREENMAN->SetNewScreen( PREV_SCREEN );
}
return;
}
ScreenOptionsMaster::HandleScreenMessage( SM );
}
void ScreenPlayerOptions::GoToPrevScreen()
{
if( SCREENMAN->IsStackedScreen(this) )
{
SCREENMAN->PopTopScreen( SM_BackFromPlayerOptions );
}
else
{
SCREENMAN->DeletePreparedScreens();
SCREENMAN->SetNewScreen( PREV_SCREEN );
}
}
void ScreenPlayerOptions::GoToNextScreen()
{
if( SCREENMAN->IsStackedScreen(this) )
{
SCREENMAN->PopTopScreen( SM_BackFromPlayerOptions );
}
else
{
SCREENMAN->SetNewScreen( NEXT_SCREEN );
}
}
void ScreenPlayerOptions::UpdateDisqualified( int row, PlayerNumber pn )
{
ASSERT( GAMESTATE->IsHumanPlayer(pn) );