From 85dd35ea48cd78f73a223a1eea92aeef3e9b61f8 Mon Sep 17 00:00:00 2001
From: Chris Danford <chrisdanford@users.sourceforge.net>
Date: Sun, 24 Aug 2003 17:20:11 +0000
Subject: [PATCH] add Blind modifier

---
 stepmania/src/PlayerOptions.cpp       | 5 +++++
 stepmania/src/PlayerOptions.h         | 1 +
 stepmania/src/ScreenHowToPlay.cpp     | 3 ++-
 stepmania/src/ScreenPlayerOptions.cpp | 5 +++--
 4 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/stepmania/src/PlayerOptions.cpp b/stepmania/src/PlayerOptions.cpp
index 1350dd5c6a..aee3ddd220 100644
--- a/stepmania/src/PlayerOptions.cpp
+++ b/stepmania/src/PlayerOptions.cpp
@@ -29,6 +29,7 @@ void PlayerOptions::Init()
 	ZERO( m_fAppearances );
 	ZERO( m_fScrolls );
 	m_fDark = 0;
+	m_fBlind = 0;
 	m_Turn = TURN_NONE;
 	m_Transform = TRANSFORM_NONE;
 	m_bHoldNotes = true;
@@ -53,6 +54,7 @@ void PlayerOptions::Approach( const PlayerOptions& other, float fDeltaSeconds )
 	for( i=0; i<NUM_SCROLLS; i++ )
 		fapproach( m_fScrolls[i], other.m_fScrolls[i], fDeltaSeconds );
 	fapproach( m_fDark, other.m_fDark, fDeltaSeconds );
+	fapproach( m_fBlind, other.m_fBlind, fDeltaSeconds );
 	fapproach( m_fPerspectiveTilt, other.m_fPerspectiveTilt, fDeltaSeconds );
 }
 
@@ -110,6 +112,8 @@ CString PlayerOptions::GetString()
 
 	if( m_fDark == 1)				sReturn += "Dark, ";
 
+	if( m_fBlind == 1)				sReturn += "Blind, ";
+
 	switch( m_Turn )
 	{
 	case TURN_NONE:										break;
@@ -221,6 +225,7 @@ void PlayerOptions::FromString( CString sOptions )
 		else if( sBit == "noholds" )	m_bHoldNotes = false;
 		else if( sBit == "nofreeze" )	m_bHoldNotes = false;
 		else if( sBit == "dark" )		m_fDark = 1;
+		else if( sBit == "blind" )		m_fBlind = 1;
 		else if( sBit == "timingassist")m_bTimingAssist = true;
 		else if( sBit == "protiming")	m_bProTiming = true;
 		else if( sBit == "incoming" )	m_fPerspectiveTilt = -1;
diff --git a/stepmania/src/PlayerOptions.h b/stepmania/src/PlayerOptions.h
index 140f08060e..5398516d1b 100644
--- a/stepmania/src/PlayerOptions.h
+++ b/stepmania/src/PlayerOptions.h
@@ -84,6 +84,7 @@ struct PlayerOptions
 	float		m_fAppearances[NUM_APPEARANCES];
 	float		m_fScrolls[NUM_SCROLLS];
 	float		m_fDark;
+	float		m_fBlind;
 	Turn		m_Turn;
 	Transform	m_Transform;
 	bool		m_bHoldNotes;
diff --git a/stepmania/src/ScreenHowToPlay.cpp b/stepmania/src/ScreenHowToPlay.cpp
index 67f08aff61..1c80b5cee3 100644
--- a/stepmania/src/ScreenHowToPlay.cpp
+++ b/stepmania/src/ScreenHowToPlay.cpp
@@ -134,7 +134,8 @@ ScreenHowToPlay::ScreenHowToPlay() : ScreenAttract("ScreenHowToPlay")
 	m_Player.Load( PLAYER_1, pND, &m_LifeMeterBar, NULL, NULL, NULL, NULL, NULL );
 	
 	m_Player.SetX( 480 );
-	m_Player.DontShowJudgement();
+	// Don't show judgement
+	GAMESTATE->m_PlayerOptions[PLAYER_1].m_fBlind = 1;
 	this->AddChild( &m_Player );
 	delete pND;
 
diff --git a/stepmania/src/ScreenPlayerOptions.cpp b/stepmania/src/ScreenPlayerOptions.cpp
index 299af56027..2193e2241b 100644
--- a/stepmania/src/ScreenPlayerOptions.cpp
+++ b/stepmania/src/ScreenPlayerOptions.cpp
@@ -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","ON" ),	
+	OptionRow( "Dark",				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_fDark ? 1 : 0;
+		m_iSelectedOption[p][PO_DARK]		= po.m_fBlind ? 2 : (po.m_fDark ? 1 : 0);
 
 
 		if( GAMESTATE->m_bEditing )
@@ -369,6 +369,7 @@ 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;
 		
 		switch(m_iSelectedOption[p][PO_PERSPECTIVE])
 		{