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

Fixed cut off arrows in editor playback

Browse Source
This commit is contained in:
Chris Danford
2003-02-19 06:42:29 +00:00
parent 6529c5ca70
commit 82b51a2896
2 changed files with 16 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/Themes/default/metrics.ini
+2 -1
View File
@@ -664,6 +664,8 @@ JudgmentY=210
ComboY=270 ComboY=270
HoldJudgmentY=150 HoldJudgmentY=150
BrightGhostComboThreshold=100 BrightGhostComboThreshold=100
StartDrawingAtPixels=-60
StopDrawingAtPixels=350
[GameState] [GameState]
StageColorDemo=0.3,1.0,0.3,1 // green StageColorDemo=0.3,1.0,0.3,1 // green
@@ -715,7 +717,6 @@ NextEffect=Left,Down,Right
NextAppearance=Left,Up,Right NextAppearance=Left,Up,Right
NextTurn= NextTurn=
Reverse=Down,Left,Right,Left,Right Reverse=Down,Left,Right,Left,Right
NextColor=
HoldNotes=Right,Left,Down,Up HoldNotes=Right,Left,Down,Up
Dark= Dark=
CancelAll=Left,Right,Left,Right,Left,Right,Left,Right CancelAll=Left,Right,Left,Right,Left,Right,Left,Right
stepmania/src/Player.cpp
+14 -12
View File
@@ -28,11 +28,13 @@
#include "ThemeManager.h" #include "ThemeManager.h"
#include "Combo.h" #include "Combo.h"
#define GRAY_ARROWS_Y THEME->GetMetricF("Player","GrayArrowsY") #define GRAY_ARROWS_Y THEME->GetMetricF("Player","GrayArrowsY")
#define JUDGMENT_Y THEME->GetMetricF("Player","JudgmentY") #define JUDGMENT_Y THEME->GetMetricF("Player","JudgmentY")
#define COMBO_Y THEME->GetMetricF("Player","ComboY") #define COMBO_Y THEME->GetMetricF("Player","ComboY")
#define HOLD_JUDGMENT_Y THEME->GetMetricF("Player","HoldJudgmentY") #define HOLD_JUDGMENT_Y THEME->GetMetricF("Player","HoldJudgmentY")
CachedThemeMetric BRIGHT_GHOST_COMBO_THRESHOLD("Player","BrightGhostComboThreshold"); 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() Player::Player()
@@ -119,22 +121,22 @@ void Player::Load( PlayerNumber pn, NoteData* pNoteData, LifeMeter* pLM, ScoreDi
default: ASSERT(0); default: ASSERT(0);
} }
int iPixelsToDrawBefore = -60; int iStartDrawingAtPixels = GAMESTATE->m_bEditing ? -100 : START_DRAWING_AT_PIXELS;
int iPixelsToDrawAfter = 350; int iStopDrawingAtPixels = GAMESTATE->m_bEditing ? 400 : STOP_DRAWING_AT_PIXELS;
// If both options are on, we *do* need to multiply it twice. // If both options are on, we *do* need to multiply it twice.
if( GAMESTATE->m_PlayerOptions[pn].m_bEffects[PlayerOptions::EFFECT_MINI] ) if( GAMESTATE->m_PlayerOptions[pn].m_bEffects[PlayerOptions::EFFECT_MINI] )
{ {
iPixelsToDrawBefore *= 2; iStartDrawingAtPixels *= 2;
iPixelsToDrawAfter *= 2; iStopDrawingAtPixels *= 2;
} }
if( GAMESTATE->m_PlayerOptions[pn].m_bEffects[PlayerOptions::EFFECT_SPACE] ) if( GAMESTATE->m_PlayerOptions[pn].m_bEffects[PlayerOptions::EFFECT_SPACE] )
{ {
iPixelsToDrawBefore *= 2; iStartDrawingAtPixels *= 2;
iPixelsToDrawAfter *= 2; iStopDrawingAtPixels *= 2;
} }
m_NoteField.Load( (NoteData*)this, pn, iPixelsToDrawBefore, iPixelsToDrawAfter ); m_NoteField.Load( (NoteData*)this, pn, iStartDrawingAtPixels, iStopDrawingAtPixels );
m_GrayArrowRow.Load( pn ); m_GrayArrowRow.Load( pn );
m_GhostArrowRow.Load( pn ); m_GhostArrowRow.Load( pn );