remove backdrop position (do it within the backdrop)

add hold judgement position
This commit is contained in:
Glenn Maynard
2003-04-17 23:21:22 +00:00
parent 924cb3f1bc
commit a3aebd8dfc
3 changed files with 3 additions and 8 deletions
+2 -7
View File
@@ -39,17 +39,13 @@ void NoteFieldMode::BeginDrawTrack(int tn)
DISPLAY->EnterPerspective(m_fFov, true, m_fNear, m_fFar); DISPLAY->EnterPerspective(m_fFov, true, m_fNear, m_fFar);
m_Position.BeginDraw(); m_Position.BeginDraw();
if(tn == -1) if(tn != -1)
m_PositionBackdrop.BeginDraw();
else
m_PositionTrack[tn].BeginDraw(); m_PositionTrack[tn].BeginDraw();
} }
void NoteFieldMode::EndDrawTrack(int tn) void NoteFieldMode::EndDrawTrack(int tn)
{ {
if(tn == -1) if(tn != -1)
m_PositionBackdrop.EndDraw();
else
m_PositionTrack[tn].EndDraw(); m_PositionTrack[tn].EndDraw();
m_Position.EndDraw(); m_Position.EndDraw();
@@ -99,7 +95,6 @@ void NoteFieldMode::Load(IniFile &ini, CString id, int pn)
GetValue( ini, pn, id, "Center", m_Center ); GetValue( ini, pn, id, "Center", m_Center );
GetValue( ini, pn, id, "Position", m_Position ); GetValue( ini, pn, id, "Position", m_Position );
GetValue( ini, pn, id, "BackdropPosition", m_PositionBackdrop );
GetValue( ini, pn, id, "Judgment", m_JudgmentCmd ); GetValue( ini, pn, id, "Judgment", m_JudgmentCmd );
GetValue( ini, pn, id, "Combo", m_ComboCmd ); GetValue( ini, pn, id, "Combo", m_ComboCmd );
-1
View File
@@ -43,7 +43,6 @@ struct NoteFieldMode
float m_fFirstPixelToDrawScale, m_fLastPixelToDrawScale; float m_fFirstPixelToDrawScale, m_fLastPixelToDrawScale;
CString m_Backdrop; CString m_Backdrop;
Actor m_PositionBackdrop;
CString m_JudgmentCmd, m_ComboCmd; CString m_JudgmentCmd, m_ComboCmd;
CString m_HoldJudgmentCmd[MAX_NOTE_TRACKS]; CString m_HoldJudgmentCmd[MAX_NOTE_TRACKS];
+1
View File
@@ -164,6 +164,7 @@ void Player::Load( PlayerNumber pn, NoteData* pNoteData, LifeMeter* pLM, ScoreDi
{ {
m_HoldJudgment[c].SetY( bReverse ? SCREEN_BOTTOM-HOLD_JUDGMENT_Y : SCREEN_TOP+HOLD_JUDGMENT_Y ); m_HoldJudgment[c].SetY( bReverse ? SCREEN_BOTTOM-HOLD_JUDGMENT_Y : SCREEN_TOP+HOLD_JUDGMENT_Y );
m_HoldJudgment[c].SetX( (float)pStyleDef->m_ColumnInfo[pn][c].fXOffset ); m_HoldJudgment[c].SetX( (float)pStyleDef->m_ColumnInfo[pn][c].fXOffset );
m_HoldJudgment[c].Command( g_NoteFieldMode[pn].m_HoldJudgmentCmd[c] );
} }
m_ArrowBackdrop.SetY( bReverse ? SCREEN_BOTTOM-GRAY_ARROWS_Y : SCREEN_TOP+GRAY_ARROWS_Y ); m_ArrowBackdrop.SetY( bReverse ? SCREEN_BOTTOM-GRAY_ARROWS_Y : SCREEN_TOP+GRAY_ARROWS_Y );