add Blind modifier

This commit is contained in:
Chris Danford
2003-08-24 17:20:58 +00:00
parent 85dd35ea48
commit 49e00e8536
3 changed files with 6 additions and 9 deletions
+1 -2
View File
@@ -62,7 +62,6 @@ PlayerMinus::PlayerMinus()
BRIGHT_GHOST_COMBO_THRESHOLD.Refresh(); BRIGHT_GHOST_COMBO_THRESHOLD.Refresh();
m_PlayerNumber = PLAYER_INVALID; m_PlayerNumber = PLAYER_INVALID;
m_bShowJudgment = true;
m_pLifeMeter = NULL; m_pLifeMeter = NULL;
m_pCombinedLifeMeter = NULL; m_pCombinedLifeMeter = NULL;
@@ -407,7 +406,7 @@ void PlayerMinus::DrawPrimitives()
if( fTilt != 0 ) if( fTilt != 0 )
DISPLAY->ExitPerspective(); DISPLAY->ExitPerspective();
if (m_bShowJudgment) if( GAMESTATE->m_PlayerOptions[m_PlayerNumber].m_fBlind == 0 )
{ {
if( GAMESTATE->m_PlayerOptions[m_PlayerNumber].m_bProTiming ) if( GAMESTATE->m_PlayerOptions[m_PlayerNumber].m_bProTiming )
m_ProTimingDisplay.Draw(); m_ProTimingDisplay.Draw();
-2
View File
@@ -51,7 +51,6 @@ public:
void Step( int col, RageTimer tm ); void Step( int col, RageTimer tm );
void RandomiseNotes( int iNoteRow ); void RandomiseNotes( int iNoteRow );
void FadeToFail(); void FadeToFail();
void DontShowJudgement() { m_bShowJudgment = false; } // Used in ScreenHowToPlay
protected: protected:
void UpdateTapNotesMissedOlderThan( float fMissIfOlderThanThisBeat ); void UpdateTapNotesMissedOlderThan( float fMissIfOlderThanThisBeat );
@@ -88,7 +87,6 @@ protected:
Inventory* m_pInventory; Inventory* m_pInventory;
CString m_sLastSeenNoteSkin; CString m_sLastSeenNoteSkin;
bool m_bShowJudgment;
int m_iRowLastCrossed; int m_iRowLastCrossed;
RageSound m_soundMineExplosion; RageSound m_soundMineExplosion;
+5 -5
View File
@@ -38,7 +38,7 @@ enum {
PO_SCROLL, PO_SCROLL,
PO_NOTE_SKIN, PO_NOTE_SKIN,
PO_HOLD_NOTES, PO_HOLD_NOTES,
PO_DARK, PO_HIDE,
PO_PERSPECTIVE, PO_PERSPECTIVE,
PO_STEP, PO_STEP,
PO_CHARACTER, PO_CHARACTER,
@@ -61,7 +61,7 @@ OptionRow g_PlayerOptionsLines[NUM_PLAYER_OPTIONS_LINES] = {
OptionRow( "Scroll", false, "STANDARD","REVERSE","SPLIT","ALTERNATE" ), OptionRow( "Scroll", false, "STANDARD","REVERSE","SPLIT","ALTERNATE" ),
OptionRow( "Note\nSkin", false, "" ), OptionRow( "Note\nSkin", false, "" ),
OptionRow( "Holds", false, "OFF","ON" ), OptionRow( "Holds", false, "OFF","ON" ),
OptionRow( "Dark", false, "OFF","DARK","BLIND"), OptionRow( "Hide", false, "OFF","DARK","BLIND"),
OptionRow( "Perspec\n-tive", false, "" ), OptionRow( "Perspec\n-tive", false, "" ),
OptionRow( "Step", false, "" ), OptionRow( "Step", false, "" ),
OptionRow( "Character", 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_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 ) if( GAMESTATE->m_bEditing )
@@ -368,8 +368,8 @@ void ScreenPlayerOptions::ExportOptions()
po.m_bHoldNotes = (m_iSelectedOption[p][PO_HOLD_NOTES] == 1); 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_fDark = (m_iSelectedOption[p][PO_HIDE] == 1) ? 1.f : 0.f;
po.m_fBlind = (m_iSelectedOption[p][PO_DARK] == 2) ? 1.f : 0.f; po.m_fBlind = (m_iSelectedOption[p][PO_HIDE] == 2) ? 1.f : 0.f;
switch(m_iSelectedOption[p][PO_PERSPECTIVE]) switch(m_iSelectedOption[p][PO_PERSPECTIVE])
{ {