From a5e1ea15a4c158e7319b17d11c0ece4a353b7cf9 Mon Sep 17 00:00:00 2001 From: Chris Danford Date: Sun, 6 Feb 2005 19:15:38 +0000 Subject: [PATCH] cache --- stepmania/src/Player.cpp | 24 ++++++++++++++---------- 1 file changed, 14 insertions(+), 10 deletions(-) diff --git a/stepmania/src/Player.cpp b/stepmania/src/Player.cpp index 7bfaeb7a45..396452fc68 100644 --- a/stepmania/src/Player.cpp +++ b/stepmania/src/Player.cpp @@ -37,16 +37,20 @@ #include "GameSoundManager.h" #include "Style.h" +CString JUDGMENT_X_NAME( size_t p, size_t both_sides ) { return "JudgmentXOffset" + (both_sides ? CString("BothSides") : ssprintf("OneSideP%d",p+1) ); } +CString COMBO_X_NAME( size_t p, size_t both_sides ) { return "ComboXOffset" + (both_sides ? CString("BothSides") : ssprintf("OneSideP%d",p+1) ); } +CString ATTACK_DISPLAY_X_NAME( size_t p, size_t both_sides ){ return "AttackDisplayXOffset" + (both_sides ? CString("BothSides") : ssprintf("OneSideP%d",p+1) ); } + ThemeMetric GRAY_ARROWS_Y_STANDARD ("Player","ReceptorArrowsYStandard"); ThemeMetric GRAY_ARROWS_Y_REVERSE ("Player","ReceptorArrowsYReverse"); -#define JUDGMENT_X( p, both_sides ) THEME->GetMetricF("Player",both_sides ? CString("JudgmentXOffsetBothSides") : ssprintf("JudgmentXOffsetOneSideP%d",p+1)) -ThemeMetric JUDGMENT_Y ("Player","JudgmentY"); +ThemeMetric2D JUDGMENT_X ("Player",JUDGMENT_X_NAME,NUM_PLAYERS,2); +ThemeMetric JUDGMENT_Y ("Player","JudgmentY"); ThemeMetric JUDGMENT_Y_REVERSE ("Player","JudgmentYReverse"); -#define COMBO_X( p, both_sides ) THEME->GetMetricF("Player",both_sides ? CString("ComboXOffsetBothSides") : ssprintf("ComboXOffsetOneSideP%d",p+1)) -ThemeMetric COMBO_Y ("Player","ComboY"); -ThemeMetric COMBO_Y_REVERSE ("Player","ComboYReverse"); -#define ATTACK_DISPLAY_X( p, both_sides ) THEME->GetMetricF("Player",both_sides ? CString("AttackDisplayXOffsetBothSides") : ssprintf("AttackDisplayXOffsetOneSideP%d",p+1)) -ThemeMetric ATTACK_DISPLAY_Y ("Player","AttackDisplayY"); +ThemeMetric2D COMBO_X ("Player",COMBO_X_NAME,NUM_PLAYERS,2); +ThemeMetric COMBO_Y ("Player","ComboY"); +ThemeMetric COMBO_Y_REVERSE ("Player","ComboYReverse"); +ThemeMetric2D ATTACK_DISPLAY_X ("Player",ATTACK_DISPLAY_X_NAME,NUM_PLAYERS,2); +ThemeMetric ATTACK_DISPLAY_Y ("Player","AttackDisplayY"); ThemeMetric ATTACK_DISPLAY_Y_REVERSE ("Player","AttackDisplayYReverse"); ThemeMetric HOLD_JUDGMENT_Y_STANDARD ("Player","HoldJudgmentYStandard"); ThemeMetric HOLD_JUDGMENT_Y_REVERSE ("Player","HoldJudgmentYReverse"); @@ -226,11 +230,11 @@ void Player::Load( const NoteData& noteData ) const bool bReverse = GAMESTATE->m_pPlayerState[pn]->m_PlayerOptions.GetReversePercentForColumn(0) == 1; bool bPlayerUsingBothSides = GAMESTATE->GetCurrentStyle()->m_StyleType==ONE_PLAYER_TWO_SIDES; - m_Combo.SetX( COMBO_X(pn,bPlayerUsingBothSides) ); + m_Combo.SetX( COMBO_X.GetValue(pn,bPlayerUsingBothSides) ); m_Combo.SetY( bReverse ? COMBO_Y_REVERSE : COMBO_Y ); - m_AttackDisplay.SetX( ATTACK_DISPLAY_X(pn,bPlayerUsingBothSides) - 40 ); + m_AttackDisplay.SetX( ATTACK_DISPLAY_X.GetValue(pn,bPlayerUsingBothSides) - 40 ); m_AttackDisplay.SetY( bReverse ? ATTACK_DISPLAY_Y_REVERSE : ATTACK_DISPLAY_Y ); - m_Judgment.SetX( JUDGMENT_X(pn,bPlayerUsingBothSides) ); + m_Judgment.SetX( JUDGMENT_X.GetValue(pn,bPlayerUsingBothSides) ); m_Judgment.SetY( bReverse ? JUDGMENT_Y_REVERSE : JUDGMENT_Y ); // Need to set Y positions of all these elements in Update since