actions/itgmania212121
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

move ShowDanger into Background

Browse Source
This commit is contained in:
Glenn Maynard
2006-11-09 06:16:08 +00:00
parent d0ce8aef5b
commit f56a2ba7df
3 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/Background.cpp
+5 -3
View File
@@ -33,6 +33,8 @@ static ThemeMetric<bool> BLINK_DANGER_ALL ("Background","BlinkDangerAll");
static ThemeMetric<bool> DANGER_ALL_IS_OPAQUE ("Background","DangerAllIsOpaque"); static ThemeMetric<bool> DANGER_ALL_IS_OPAQUE ("Background","DangerAllIsOpaque");
static ThemeMetric<float> CLAMP_OUTPUT_PERCENT ("Background","ClampOutputPercent"); static ThemeMetric<float> CLAMP_OUTPUT_PERCENT ("Background","ClampOutputPercent");
static Preference<bool> g_bShowDanger( "ShowDanger", true );
// Width of the region separating the left and right brightness areas: // Width of the region separating the left and right brightness areas:
static float g_fBackgroundCenterWidth = 40; static float g_fBackgroundCenterWidth = 40;
@@ -849,7 +851,7 @@ void BackgroundImpl::Update( float fDeltaTime )
FOREACH_PlayerNumber( p ) FOREACH_PlayerNumber( p )
{ {
if( PREFSMAN->m_bShowDanger && GAMESTATE->IsPlayerInDanger(GAMESTATE->m_pPlayerState[p]) ) if( g_bShowDanger && GAMESTATE->IsPlayerInDanger(GAMESTATE->m_pPlayerState[p]) )
m_DangerPlayer[p]->Update( fDeltaTime ); m_DangerPlayer[p]->Update( fDeltaTime );
if( GAMESTATE->IsPlayerDead(GAMESTATE->m_pPlayerState[p]) ) if( GAMESTATE->IsPlayerDead(GAMESTATE->m_pPlayerState[p]) )
@@ -910,7 +912,7 @@ void BackgroundImpl::DrawPrimitives()
FOREACH_PlayerNumber( p ) FOREACH_PlayerNumber( p )
{ {
if( PREFSMAN->m_bShowDanger && GAMESTATE->IsPlayerInDanger(GAMESTATE->m_pPlayerState[p]) ) if( g_bShowDanger && GAMESTATE->IsPlayerInDanger(GAMESTATE->m_pPlayerState[p]) )
m_DangerPlayer[p]->Draw(); m_DangerPlayer[p]->Draw();
if( GAMESTATE->IsPlayerDead(GAMESTATE->m_pPlayerState[p]) ) if( GAMESTATE->IsPlayerDead(GAMESTATE->m_pPlayerState[p]) )
m_DeadPlayer[p]->Draw(); m_DeadPlayer[p]->Draw();
@@ -934,7 +936,7 @@ bool BackgroundImpl::IsDangerAllVisible()
FOREACH_PlayerNumber( p ) FOREACH_PlayerNumber( p )
if( GAMESTATE->GetPlayerFailType(GAMESTATE->m_pPlayerState[p]) == SongOptions::FAIL_OFF ) if( GAMESTATE->GetPlayerFailType(GAMESTATE->m_pPlayerState[p]) == SongOptions::FAIL_OFF )
return false; return false;
if( !PREFSMAN->m_bShowDanger ) if( !g_bShowDanger )
return false; return false;
/* Don't show it if everyone is already failing: it's already too late and it's /* Don't show it if everyone is already failing: it's already too late and it's
stepmania/src/PrefsManager.cpp
-1
View File
@@ -288,7 +288,6 @@ PrefsManager::PrefsManager() :
m_bOnlyDedicatedMenuButtons ( "OnlyDedicatedMenuButtons", false ), m_bOnlyDedicatedMenuButtons ( "OnlyDedicatedMenuButtons", false ),
m_bMenuTimer ( "MenuTimer", true ), m_bMenuTimer ( "MenuTimer", true ),
m_bShowDanger ( "ShowDanger", true ),
m_fTimingWindowScale ( "TimingWindowScale", 1.0f ), m_fTimingWindowScale ( "TimingWindowScale", 1.0f ),
m_fTimingWindowAdd ( "TimingWindowAdd", 0 ), m_fTimingWindowAdd ( "TimingWindowAdd", 0 ),
stepmania/src/PrefsManager.h
-1
View File
@@ -129,7 +129,6 @@ public:
Preference<bool> m_bOnlyDedicatedMenuButtons; Preference<bool> m_bOnlyDedicatedMenuButtons;
Preference<bool> m_bMenuTimer; Preference<bool> m_bMenuTimer;
Preference<bool> m_bShowDanger;
Preference<float> m_fTimingWindowScale; Preference<float> m_fTimingWindowScale;
Preference<float> m_fTimingWindowAdd; // this is useful for compensating for changes in sampling rate between devices Preference<float> m_fTimingWindowAdd; // this is useful for compensating for changes in sampling rate between devices