From a3aebd8dfc8497c066ead60f7b01f3747a957975 Mon Sep 17 00:00:00 2001 From: Glenn Maynard Date: Thu, 17 Apr 2003 23:21:22 +0000 Subject: [PATCH] remove backdrop position (do it within the backdrop) add hold judgement position --- stepmania/src/NoteFieldPositioning.cpp | 9 ++------- stepmania/src/NoteFieldPositioning.h | 1 - stepmania/src/Player.cpp | 1 + 3 files changed, 3 insertions(+), 8 deletions(-) diff --git a/stepmania/src/NoteFieldPositioning.cpp b/stepmania/src/NoteFieldPositioning.cpp index 7bf54eebe1..df217f63bf 100644 --- a/stepmania/src/NoteFieldPositioning.cpp +++ b/stepmania/src/NoteFieldPositioning.cpp @@ -39,17 +39,13 @@ void NoteFieldMode::BeginDrawTrack(int tn) DISPLAY->EnterPerspective(m_fFov, true, m_fNear, m_fFar); m_Position.BeginDraw(); - if(tn == -1) - m_PositionBackdrop.BeginDraw(); - else + if(tn != -1) m_PositionTrack[tn].BeginDraw(); } void NoteFieldMode::EndDrawTrack(int tn) { - if(tn == -1) - m_PositionBackdrop.EndDraw(); - else + if(tn != -1) m_PositionTrack[tn].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, "Position", m_Position ); - GetValue( ini, pn, id, "BackdropPosition", m_PositionBackdrop ); GetValue( ini, pn, id, "Judgment", m_JudgmentCmd ); GetValue( ini, pn, id, "Combo", m_ComboCmd ); diff --git a/stepmania/src/NoteFieldPositioning.h b/stepmania/src/NoteFieldPositioning.h index 7a1e6a3ab7..f164e4e170 100644 --- a/stepmania/src/NoteFieldPositioning.h +++ b/stepmania/src/NoteFieldPositioning.h @@ -43,7 +43,6 @@ struct NoteFieldMode float m_fFirstPixelToDrawScale, m_fLastPixelToDrawScale; CString m_Backdrop; - Actor m_PositionBackdrop; CString m_JudgmentCmd, m_ComboCmd; CString m_HoldJudgmentCmd[MAX_NOTE_TRACKS]; diff --git a/stepmania/src/Player.cpp b/stepmania/src/Player.cpp index 4b4be76122..6086382e91 100644 --- a/stepmania/src/Player.cpp +++ b/stepmania/src/Player.cpp @@ -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].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 );