Add PlayerState::GetDisplayedPosition() and PlayerState::GetDisplayedTiming()

which returns the dispalyed position and timing (based on the timing display
switch in the editor), so less copy n paste in ArrowEffects and NoteField.
This commit is contained in:
Thai Pangsakulyanont
2011-09-14 12:20:42 +07:00
parent 48ca50940a
commit 8fdf42e2bb
4 changed files with 31 additions and 47 deletions
+16
View File
@@ -5,6 +5,7 @@
#include "RageLog.h"
#include "RadarValues.h"
#include "Steps.h"
#include "Song.h"
PlayerState::PlayerState()
{
@@ -189,6 +190,21 @@ int PlayerState::GetSumOfActiveAttackLevels() const
return iSum;
}
const SongPosition &PlayerState::GetDisplayedPosition() const
{
if( GAMESTATE->m_bIsUsingStepTiming )
return m_Position;
return GAMESTATE->m_Position;
}
const TimingData &PlayerState::GetDisplayedTiming() const
{
if( GAMESTATE->m_bIsUsingStepTiming && GAMESTATE->m_pCurSteps[m_PlayerNumber] != NULL )
return GAMESTATE->m_pCurSteps[m_PlayerNumber]->m_Timing;
return GAMESTATE->m_pCurSong->m_SongTiming;
}
// lua start
#include "LuaBinding.h"