simplify
This commit is contained in:
@@ -138,7 +138,6 @@ void ScreenEz2SelectPlayer::HandleScreenMessage( const ScreenMessage SM )
|
|||||||
MenuStart(PLAYER_1);
|
MenuStart(PLAYER_1);
|
||||||
}
|
}
|
||||||
|
|
||||||
TweenOursOffScreen();
|
|
||||||
StartTransitioningScreen( SM_GoToNextScreen );
|
StartTransitioningScreen( SM_GoToNextScreen );
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
@@ -201,7 +200,6 @@ void ScreenEz2SelectPlayer::MenuStart( PlayerNumber pn )
|
|||||||
|
|
||||||
if( bBothSidesJoined )
|
if( bBothSidesJoined )
|
||||||
{
|
{
|
||||||
TweenOursOffScreen();
|
|
||||||
StartTransitioningScreen( SM_GoToNextScreen );
|
StartTransitioningScreen( SM_GoToNextScreen );
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
@@ -233,8 +231,10 @@ void ScreenEz2SelectPlayer::TweenOursOnScreen()
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
void ScreenEz2SelectPlayer::TweenOursOffScreen()
|
void ScreenEz2SelectPlayer::TweenOffScreen()
|
||||||
{
|
{
|
||||||
|
ScreenWithMenuElements::TweenOffScreen();
|
||||||
|
|
||||||
FOREACH_PlayerNumber( p )
|
FOREACH_PlayerNumber( p )
|
||||||
{
|
{
|
||||||
float fOffScreenOffset = float( (p==PLAYER_1) ? -SCREEN_WIDTH : +SCREEN_WIDTH );
|
float fOffScreenOffset = float( (p==PLAYER_1) ? -SCREEN_WIDTH : +SCREEN_WIDTH );
|
||||||
|
|||||||
@@ -23,7 +23,7 @@ public:
|
|||||||
virtual void MenuStart( PlayerNumber pn );
|
virtual void MenuStart( PlayerNumber pn );
|
||||||
virtual void MenuBack( PlayerNumber pn );
|
virtual void MenuBack( PlayerNumber pn );
|
||||||
private:
|
private:
|
||||||
void TweenOursOffScreen();
|
void TweenOffScreen();
|
||||||
void TweenOursOnScreen();
|
void TweenOursOnScreen();
|
||||||
|
|
||||||
Sprite m_sprJoinMessage[NUM_PLAYERS];
|
Sprite m_sprJoinMessage[NUM_PLAYERS];
|
||||||
|
|||||||
Reference in New Issue
Block a user