From 82b51a2896605c3f8bb1319ef42cd39f58fd6004 Mon Sep 17 00:00:00 2001 From: Chris Danford Date: Wed, 19 Feb 2003 06:42:29 +0000 Subject: [PATCH] Fixed cut off arrows in editor playback --- stepmania/Themes/default/metrics.ini | 3 ++- stepmania/src/Player.cpp | 26 ++++++++++++++------------ 2 files changed, 16 insertions(+), 13 deletions(-) diff --git a/stepmania/Themes/default/metrics.ini b/stepmania/Themes/default/metrics.ini index ca04769800..c2c9d8b229 100644 --- a/stepmania/Themes/default/metrics.ini +++ b/stepmania/Themes/default/metrics.ini @@ -664,6 +664,8 @@ JudgmentY=210 ComboY=270 HoldJudgmentY=150 BrightGhostComboThreshold=100 +StartDrawingAtPixels=-60 +StopDrawingAtPixels=350 [GameState] StageColorDemo=0.3,1.0,0.3,1 // green @@ -715,7 +717,6 @@ NextEffect=Left,Down,Right NextAppearance=Left,Up,Right NextTurn= Reverse=Down,Left,Right,Left,Right -NextColor= HoldNotes=Right,Left,Down,Up Dark= CancelAll=Left,Right,Left,Right,Left,Right,Left,Right diff --git a/stepmania/src/Player.cpp b/stepmania/src/Player.cpp index 968ed20b4f..73e9b56e74 100644 --- a/stepmania/src/Player.cpp +++ b/stepmania/src/Player.cpp @@ -28,11 +28,13 @@ #include "ThemeManager.h" #include "Combo.h" -#define GRAY_ARROWS_Y THEME->GetMetricF("Player","GrayArrowsY") -#define JUDGMENT_Y THEME->GetMetricF("Player","JudgmentY") -#define COMBO_Y THEME->GetMetricF("Player","ComboY") -#define HOLD_JUDGMENT_Y THEME->GetMetricF("Player","HoldJudgmentY") -CachedThemeMetric BRIGHT_GHOST_COMBO_THRESHOLD("Player","BrightGhostComboThreshold"); +#define GRAY_ARROWS_Y THEME->GetMetricF("Player","GrayArrowsY") +#define JUDGMENT_Y THEME->GetMetricF("Player","JudgmentY") +#define COMBO_Y THEME->GetMetricF("Player","ComboY") +#define HOLD_JUDGMENT_Y THEME->GetMetricF("Player","HoldJudgmentY") +CachedThemeMetric BRIGHT_GHOST_COMBO_THRESHOLD("Player","BrightGhostComboThreshold"); +#define START_DRAWING_AT_PIXELS THEME->GetMetricI("Player","StartDrawingAtPixels") +#define STOP_DRAWING_AT_PIXELS THEME->GetMetricI("Player","StopDrawingAtPixels") Player::Player() @@ -119,22 +121,22 @@ void Player::Load( PlayerNumber pn, NoteData* pNoteData, LifeMeter* pLM, ScoreDi default: ASSERT(0); } - int iPixelsToDrawBefore = -60; - int iPixelsToDrawAfter = 350; + int iStartDrawingAtPixels = GAMESTATE->m_bEditing ? -100 : START_DRAWING_AT_PIXELS; + int iStopDrawingAtPixels = GAMESTATE->m_bEditing ? 400 : STOP_DRAWING_AT_PIXELS; // If both options are on, we *do* need to multiply it twice. if( GAMESTATE->m_PlayerOptions[pn].m_bEffects[PlayerOptions::EFFECT_MINI] ) { - iPixelsToDrawBefore *= 2; - iPixelsToDrawAfter *= 2; + iStartDrawingAtPixels *= 2; + iStopDrawingAtPixels *= 2; } if( GAMESTATE->m_PlayerOptions[pn].m_bEffects[PlayerOptions::EFFECT_SPACE] ) { - iPixelsToDrawBefore *= 2; - iPixelsToDrawAfter *= 2; + iStartDrawingAtPixels *= 2; + iStopDrawingAtPixels *= 2; } - m_NoteField.Load( (NoteData*)this, pn, iPixelsToDrawBefore, iPixelsToDrawAfter ); + m_NoteField.Load( (NoteData*)this, pn, iStartDrawingAtPixels, iStopDrawingAtPixels ); m_GrayArrowRow.Load( pn ); m_GhostArrowRow.Load( pn );