add Blind modifier

This commit is contained in:
Chris Danford
2003-08-24 17:20:11 +00:00
parent 0d5e7d8f8c
commit 85dd35ea48
4 changed files with 11 additions and 3 deletions
+5
View File
@@ -29,6 +29,7 @@ void PlayerOptions::Init()
ZERO( m_fAppearances ); ZERO( m_fAppearances );
ZERO( m_fScrolls ); ZERO( m_fScrolls );
m_fDark = 0; m_fDark = 0;
m_fBlind = 0;
m_Turn = TURN_NONE; m_Turn = TURN_NONE;
m_Transform = TRANSFORM_NONE; m_Transform = TRANSFORM_NONE;
m_bHoldNotes = true; m_bHoldNotes = true;
@@ -53,6 +54,7 @@ void PlayerOptions::Approach( const PlayerOptions& other, float fDeltaSeconds )
for( i=0; i<NUM_SCROLLS; i++ ) for( i=0; i<NUM_SCROLLS; i++ )
fapproach( m_fScrolls[i], other.m_fScrolls[i], fDeltaSeconds ); fapproach( m_fScrolls[i], other.m_fScrolls[i], fDeltaSeconds );
fapproach( m_fDark, other.m_fDark, fDeltaSeconds ); fapproach( m_fDark, other.m_fDark, fDeltaSeconds );
fapproach( m_fBlind, other.m_fBlind, fDeltaSeconds );
fapproach( m_fPerspectiveTilt, other.m_fPerspectiveTilt, fDeltaSeconds ); fapproach( m_fPerspectiveTilt, other.m_fPerspectiveTilt, fDeltaSeconds );
} }
@@ -110,6 +112,8 @@ CString PlayerOptions::GetString()
if( m_fDark == 1) sReturn += "Dark, "; if( m_fDark == 1) sReturn += "Dark, ";
if( m_fBlind == 1) sReturn += "Blind, ";
switch( m_Turn ) switch( m_Turn )
{ {
case TURN_NONE: break; case TURN_NONE: break;
@@ -221,6 +225,7 @@ void PlayerOptions::FromString( CString sOptions )
else if( sBit == "noholds" ) m_bHoldNotes = false; else if( sBit == "noholds" ) m_bHoldNotes = false;
else if( sBit == "nofreeze" ) m_bHoldNotes = false; else if( sBit == "nofreeze" ) m_bHoldNotes = false;
else if( sBit == "dark" ) m_fDark = 1; else if( sBit == "dark" ) m_fDark = 1;
else if( sBit == "blind" ) m_fBlind = 1;
else if( sBit == "timingassist")m_bTimingAssist = true; else if( sBit == "timingassist")m_bTimingAssist = true;
else if( sBit == "protiming") m_bProTiming = true; else if( sBit == "protiming") m_bProTiming = true;
else if( sBit == "incoming" ) m_fPerspectiveTilt = -1; else if( sBit == "incoming" ) m_fPerspectiveTilt = -1;
+1
View File
@@ -84,6 +84,7 @@ struct PlayerOptions
float m_fAppearances[NUM_APPEARANCES]; float m_fAppearances[NUM_APPEARANCES];
float m_fScrolls[NUM_SCROLLS]; float m_fScrolls[NUM_SCROLLS];
float m_fDark; float m_fDark;
float m_fBlind;
Turn m_Turn; Turn m_Turn;
Transform m_Transform; Transform m_Transform;
bool m_bHoldNotes; bool m_bHoldNotes;
+2 -1
View File
@@ -134,7 +134,8 @@ ScreenHowToPlay::ScreenHowToPlay() : ScreenAttract("ScreenHowToPlay")
m_Player.Load( PLAYER_1, pND, &m_LifeMeterBar, NULL, NULL, NULL, NULL, NULL ); m_Player.Load( PLAYER_1, pND, &m_LifeMeterBar, NULL, NULL, NULL, NULL, NULL );
m_Player.SetX( 480 ); m_Player.SetX( 480 );
m_Player.DontShowJudgement(); // Don't show judgement
GAMESTATE->m_PlayerOptions[PLAYER_1].m_fBlind = 1;
this->AddChild( &m_Player ); this->AddChild( &m_Player );
delete pND; delete pND;
+3 -2
View File
@@ -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","ON" ), OptionRow( "Dark", 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_fDark ? 1 : 0; m_iSelectedOption[p][PO_DARK] = po.m_fBlind ? 2 : (po.m_fDark ? 1 : 0);
if( GAMESTATE->m_bEditing ) if( GAMESTATE->m_bEditing )
@@ -369,6 +369,7 @@ 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_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]) switch(m_iSelectedOption[p][PO_PERSPECTIVE])
{ {