cleanup: actors generally shouldn't move themselves

This commit is contained in:
Glenn Maynard
2003-03-02 06:16:03 +00:00
parent a696414cac
commit 6071bf6fac
2 changed files with 9 additions and 13 deletions
-13
View File
@@ -161,19 +161,6 @@ void Player::Load( PlayerNumber pn, NoteData* pNoteData, LifeMeter* pLM, ScoreDi
m_NoteField.SetY( bReverse ? SCREEN_BOTTOM-GRAY_ARROWS_Y : SCREEN_TOP+GRAY_ARROWS_Y );
m_GrayArrowRow.SetY( bReverse ? SCREEN_BOTTOM-GRAY_ARROWS_Y : SCREEN_TOP+GRAY_ARROWS_Y );
// If solo-single is enabled..
/* XXX: Maybe this should be enabled for all ONE_PLAYER_ONE_CREDIT modes.
* I don't feel like testing that right now, though. */
if( PREFSMAN->m_bSoloSingle &&
GAMESTATE->GetCurrentStyleDef()->m_NotesType == STYLE_DANCE_SINGLE &&
GAMESTATE->GetNumSidesJoined() == 1 )
{
SetX(SCREEN_WIDTH/2);
}
m_GhostArrowRow.SetY( bReverse ? SCREEN_BOTTOM-GRAY_ARROWS_Y : SCREEN_TOP+GRAY_ARROWS_Y );
if( GAMESTATE->m_PlayerOptions[pn].m_fEffects[PlayerOptions::EFFECT_MINI] == 1 )
+9
View File
@@ -208,6 +208,15 @@ ScreenGameplay::ScreenGameplay( bool bDemonstration )
continue;
float fPlayerX = (float) GAMESTATE->GetCurrentStyleDef()->m_iCenterX[p];
// If solo-single is enabled..
/* XXX: Maybe this should be enabled for all ONE_PLAYER_ONE_CREDIT modes.
* I don't feel like testing that right now, though. */
if( PREFSMAN->m_bSoloSingle &&
GAMESTATE->GetCurrentStyleDef()->m_NotesType == STYLE_DANCE_SINGLE &&
GAMESTATE->GetNumSidesJoined() == 1 )
fPlayerX = SCREEN_WIDTH/2;
m_Player[p].SetX( fPlayerX );
this->AddChild( &m_Player[p] );