From 49e00e853675cafafe54d34f94508be3c2f89205 Mon Sep 17 00:00:00 2001 From: Chris Danford Date: Sun, 24 Aug 2003 17:20:58 +0000 Subject: [PATCH] add Blind modifier --- stepmania/src/Player.cpp | 3 +-- stepmania/src/Player.h | 2 -- stepmania/src/ScreenPlayerOptions.cpp | 10 +++++----- 3 files changed, 6 insertions(+), 9 deletions(-) diff --git a/stepmania/src/Player.cpp b/stepmania/src/Player.cpp index 95b2b2b1d0..b6fa048950 100644 --- a/stepmania/src/Player.cpp +++ b/stepmania/src/Player.cpp @@ -62,7 +62,6 @@ PlayerMinus::PlayerMinus() BRIGHT_GHOST_COMBO_THRESHOLD.Refresh(); m_PlayerNumber = PLAYER_INVALID; - m_bShowJudgment = true; m_pLifeMeter = NULL; m_pCombinedLifeMeter = NULL; @@ -407,7 +406,7 @@ void PlayerMinus::DrawPrimitives() if( fTilt != 0 ) DISPLAY->ExitPerspective(); - if (m_bShowJudgment) + if( GAMESTATE->m_PlayerOptions[m_PlayerNumber].m_fBlind == 0 ) { if( GAMESTATE->m_PlayerOptions[m_PlayerNumber].m_bProTiming ) m_ProTimingDisplay.Draw(); diff --git a/stepmania/src/Player.h b/stepmania/src/Player.h index fecb33c789..eb2124f980 100644 --- a/stepmania/src/Player.h +++ b/stepmania/src/Player.h @@ -51,7 +51,6 @@ public: void Step( int col, RageTimer tm ); void RandomiseNotes( int iNoteRow ); void FadeToFail(); - void DontShowJudgement() { m_bShowJudgment = false; } // Used in ScreenHowToPlay protected: void UpdateTapNotesMissedOlderThan( float fMissIfOlderThanThisBeat ); @@ -88,7 +87,6 @@ protected: Inventory* m_pInventory; CString m_sLastSeenNoteSkin; - bool m_bShowJudgment; int m_iRowLastCrossed; RageSound m_soundMineExplosion; diff --git a/stepmania/src/ScreenPlayerOptions.cpp b/stepmania/src/ScreenPlayerOptions.cpp index 2193e2241b..ba23eca760 100644 --- a/stepmania/src/ScreenPlayerOptions.cpp +++ b/stepmania/src/ScreenPlayerOptions.cpp @@ -38,7 +38,7 @@ enum { PO_SCROLL, PO_NOTE_SKIN, PO_HOLD_NOTES, - PO_DARK, + PO_HIDE, PO_PERSPECTIVE, PO_STEP, PO_CHARACTER, @@ -61,7 +61,7 @@ OptionRow g_PlayerOptionsLines[NUM_PLAYER_OPTIONS_LINES] = { OptionRow( "Scroll", false, "STANDARD","REVERSE","SPLIT","ALTERNATE" ), OptionRow( "Note\nSkin", false, "" ), OptionRow( "Holds", false, "OFF","ON" ), - OptionRow( "Dark", false, "OFF","DARK","BLIND"), + OptionRow( "Hide", false, "OFF","DARK","BLIND"), OptionRow( "Perspec\n-tive", false, "" ), OptionRow( "Step", false, "" ), OptionRow( "Character", false, "" ), @@ -236,7 +236,7 @@ void ScreenPlayerOptions::ImportOptions() m_iSelectedOption[p][PO_HOLD_NOTES] = po.m_bHoldNotes ? 1 : 0; - m_iSelectedOption[p][PO_DARK] = po.m_fBlind ? 2 : (po.m_fDark ? 1 : 0); + m_iSelectedOption[p][PO_HIDE] = po.m_fBlind ? 2 : (po.m_fDark ? 1 : 0); if( GAMESTATE->m_bEditing ) @@ -368,8 +368,8 @@ void ScreenPlayerOptions::ExportOptions() po.m_bHoldNotes = (m_iSelectedOption[p][PO_HOLD_NOTES] == 1); - po.m_fDark = (m_iSelectedOption[p][PO_DARK] == 1) ? 1.f : 0.f; - po.m_fBlind = (m_iSelectedOption[p][PO_DARK] == 2) ? 1.f : 0.f; + po.m_fDark = (m_iSelectedOption[p][PO_HIDE] == 1) ? 1.f : 0.f; + po.m_fBlind = (m_iSelectedOption[p][PO_HIDE] == 2) ? 1.f : 0.f; switch(m_iSelectedOption[p][PO_PERSPECTIVE]) {