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

add name to Actor

Browse Source
This commit is contained in:
Chris Danford
2003-04-12 06:16:12 +00:00
parent ca1b94a043
commit e148806d1b
91 changed files with 555 additions and 786 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/ScreenEz2SelectPlayer.cpp
+7 -7
View File
@@ -45,7 +45,7 @@ ScreenEz2SelectPlayer (Constructor)
Desc: Sets up the screen display
************************************/
ScreenEz2SelectPlayer::ScreenEz2SelectPlayer()
ScreenEz2SelectPlayer::ScreenEz2SelectPlayer() : Screen("ScreenEz2SelectPlayer")
{
// Unjoin the players, then let them join back in on this screen
GAMESTATE->m_bPlayersCanJoin = true;
@@ -219,9 +219,9 @@ void ScreenEz2SelectPlayer::MenuStart( PlayerNumber pn )
if( FOLD_ON_JOIN )
{
m_sprJoinMessage[pn].BeginTweening( 0.25f );
m_sprJoinMessage[pn].SetTweenZoomY( 0 );
m_sprJoinMessage[pn].SetZoomY( 0 );
m_sprJoinFrame[pn].BeginTweening( 0.25f );
m_sprJoinFrame[pn].SetTweenZoomY( 0 );
m_sprJoinFrame[pn].SetZoomY( 0 );
}
bool bBothSidesJoined = true;
@@ -254,12 +254,12 @@ void ScreenEz2SelectPlayer::TweenOnScreen()
fOriginalX = m_sprJoinMessage[p].GetX();
m_sprJoinMessage[p].SetX( m_sprJoinMessage[p].GetX()+fOffScreenOffset );
m_sprJoinMessage[p].BeginTweening( 0.5f, Actor::TWEEN_BOUNCE_END );
m_sprJoinMessage[p].SetTweenX( fOriginalX );
m_sprJoinMessage[p].SetX( fOriginalX );
fOriginalX = m_sprJoinFrame[p].GetX();
m_sprJoinFrame[p].SetX( m_sprJoinMessage[p].GetX()+fOffScreenOffset );
m_sprJoinFrame[p].BeginTweening( 0.5f, Actor::TWEEN_BOUNCE_END );
m_sprJoinFrame[p].SetTweenX( fOriginalX );
m_sprJoinFrame[p].SetX( fOriginalX );
}
}
@@ -270,8 +270,8 @@ void ScreenEz2SelectPlayer::TweenOffScreen()
float fOffScreenOffset = float( (p==PLAYER_1) ? -SCREEN_WIDTH : +SCREEN_WIDTH );
m_sprJoinMessage[p].BeginTweening( 0.5f, Actor::TWEEN_DECELERATE );
m_sprJoinMessage[p].SetTweenX( m_sprJoinMessage[p].GetX()+fOffScreenOffset );
m_sprJoinMessage[p].SetX( m_sprJoinMessage[p].GetX()+fOffScreenOffset );
m_sprJoinFrame[p].BeginTweening( 0.5f, Actor::TWEEN_DECELERATE );
m_sprJoinFrame[p].SetTweenX( m_sprJoinMessage[p].GetX()+fOffScreenOffset );
m_sprJoinFrame[p].SetX( m_sprJoinMessage[p].GetX()+fOffScreenOffset );
}
}