merge ffffffff

This commit is contained in:
AJ Kelly
2010-08-23 02:04:00 -05:00
2 changed files with 3 additions and 1 deletions
+1
View File
@@ -125,6 +125,7 @@ FrameWidthEffectsMaxMultiplier=1.2
FrameWidthLockEffectsToOverlapping=false FrameWidthLockEffectsToOverlapping=false
FrameWidthLockEffectsTweenPixels=25 FrameWidthLockEffectsTweenPixels=25
ArrowSpacing=64 ArrowSpacing=64
DrawHiddenNotesAfterReceptor=true
[Background] [Background]
# Background stuff. again, its usually a better idea to leave this alone # Background stuff. again, its usually a better idea to leave this alone
+2 -1
View File
@@ -15,6 +15,7 @@
#include <float.h> #include <float.h>
static ThemeMetric<float> ARROW_SPACING( "ArrowEffects", "ArrowSpacing" ); static ThemeMetric<float> ARROW_SPACING( "ArrowEffects", "ArrowSpacing" );
static ThemeMetric<bool> HIDDEN_SUDDEN_PAST_RECEPTOR( "ArrowEffects", "DrawHiddenNotesAfterReceptor");
static float GetNoteFieldHeight( const PlayerState* pPlayerState ) static float GetNoteFieldHeight( const PlayerState* pPlayerState )
{ {
@@ -546,7 +547,7 @@ float ArrowGetPercentVisible( const PlayerState* pPlayerState, float fYPosWithou
{ {
const float fDistFromCenterLine = fYPosWithoutReverse - GetCenterLine( pPlayerState ); const float fDistFromCenterLine = fYPosWithoutReverse - GetCenterLine( pPlayerState );
if( fYPosWithoutReverse < 0 ) // past Gray Arrows if( fYPosWithoutReverse < 0 && HIDDEN_SUDDEN_PAST_RECEPTOR) // past Gray Arrows
return 1; // totally visible return 1; // totally visible
const float* fAppearances = pPlayerState->m_PlayerOptions.GetCurrent().m_fAppearances; const float* fAppearances = pPlayerState->m_PlayerOptions.GetCurrent().m_fAppearances;