Use PlayerPlus (a Player plus a NoteData, this gives the old behavior of Player, i.e. calling Load( nd )).
This commit is contained in:
@@ -793,9 +793,10 @@ void ScreenEdit::PlayTicks()
|
|||||||
iRowLastCrossed = iSongRow;
|
iRowLastCrossed = iSongRow;
|
||||||
|
|
||||||
int iTickRow = -1;
|
int iTickRow = -1;
|
||||||
|
const NoteData &nd = m_Player.GetNoteData();
|
||||||
// for each index we crossed since the last update:
|
// for each index we crossed since the last update:
|
||||||
FOREACH_NONEMPTY_ROW_ALL_TRACKS_RANGE( m_Player.m_NoteData, r, iRowLastCrossed+1, iSongRow+1 )
|
FOREACH_NONEMPTY_ROW_ALL_TRACKS_RANGE( nd, r, iRowLastCrossed+1, iSongRow+1 )
|
||||||
if( m_Player.m_NoteData.IsThereATapOrHoldHeadAtRow( r ) )
|
if( nd.IsThereATapOrHoldHeadAtRow( r ) )
|
||||||
iTickRow = r;
|
iTickRow = r;
|
||||||
|
|
||||||
iRowLastCrossed = iSongRow;
|
iRowLastCrossed = iSongRow;
|
||||||
|
|||||||
@@ -258,7 +258,7 @@ protected:
|
|||||||
|
|
||||||
// for MODE_PLAY
|
// for MODE_PLAY
|
||||||
void SetupCourseAttacks();
|
void SetupCourseAttacks();
|
||||||
Player m_Player;
|
PlayerPlus m_Player;
|
||||||
Background m_Background;
|
Background m_Background;
|
||||||
Foreground m_Foreground;
|
Foreground m_Foreground;
|
||||||
bool m_bReturnToRecordMenuAfterPlay;
|
bool m_bReturnToRecordMenuAfterPlay;
|
||||||
|
|||||||
@@ -154,7 +154,7 @@ void ScreenHowToPlay::Init()
|
|||||||
GAMESTATE->m_bGameplayLeadIn.Set( false );
|
GAMESTATE->m_bGameplayLeadIn.Set( false );
|
||||||
GAMESTATE->m_pPlayerState[PLAYER_1]->m_PlayerController = PC_AUTOPLAY;
|
GAMESTATE->m_pPlayerState[PLAYER_1]->m_PlayerController = PC_AUTOPLAY;
|
||||||
|
|
||||||
m_pPlayer = new Player;
|
m_pPlayer = new PlayerPlus;
|
||||||
m_pPlayer->Init(
|
m_pPlayer->Init(
|
||||||
"Player",
|
"Player",
|
||||||
GAMESTATE->m_pPlayerState[PLAYER_1],
|
GAMESTATE->m_pPlayerState[PLAYER_1],
|
||||||
|
|||||||
@@ -23,7 +23,7 @@ public:
|
|||||||
protected:
|
protected:
|
||||||
virtual void Step();
|
virtual void Step();
|
||||||
LifeMeterBar *m_pLifeMeterBar;
|
LifeMeterBar *m_pLifeMeterBar;
|
||||||
Player *m_pPlayer;
|
PlayerPlus *m_pPlayer;
|
||||||
Model *m_pmCharacter;
|
Model *m_pmCharacter;
|
||||||
Model *m_pmDancePad;
|
Model *m_pmDancePad;
|
||||||
int m_iW2s;
|
int m_iW2s;
|
||||||
|
|||||||
Reference in New Issue
Block a user