From a2bdac3d8a127acf971d25677eb867b2f196e93f Mon Sep 17 00:00:00 2001 From: Jason Felds Date: Mon, 16 Mar 2009 04:28:31 +0000 Subject: [PATCH] Fix ScreenEvaluation stat reporting: everything lines up properly, and in the right order. --- .../ScreenEvaluation DetailFrame p1/default.lua | 11 +++++++---- stepmania/src/ScreenEvaluation.cpp | 2 +- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/stepmania/Themes/default/Graphics/ScreenEvaluation DetailFrame p1/default.lua b/stepmania/Themes/default/Graphics/ScreenEvaluation DetailFrame p1/default.lua index 03a2ebb6e7..7d64f6cd8d 100644 --- a/stepmania/Themes/default/Graphics/ScreenEvaluation DetailFrame p1/default.lua +++ b/stepmania/Themes/default/Graphics/ScreenEvaluation DetailFrame p1/default.lua @@ -1,19 +1,22 @@ return Def.ActorFrame { LoadActor("frame") .. { }; - LoadActor( THEME:GetPathG("PaneDisplay","label Hands") ) .. { + + -- Use the traditional order: NumSteps, Jumps, Holds, Mines, Hands, Rolls + + LoadActor( THEME:GetPathG("PaneDisplay","label NumSteps") ) .. { InitCommand=cmd(horizalign,right;x,-22;y,-12+16*0;shadowlengthx,0;shadowlengthy,2;shadowcolor,color("#000000AA");); }; - LoadActor( THEME:GetPathG("PaneDisplay","label Holds") ) .. { + LoadActor( THEME:GetPathG("PaneDisplay","label Jumps") ) .. { InitCommand=cmd(horizalign,right;x,-22;y,-12+16*1;shadowlengthx,0;shadowlengthy,2;shadowcolor,color("#000000AA");); }; - LoadActor( THEME:GetPathG("PaneDisplay","label Jumps") ) .. { + LoadActor( THEME:GetPathG("PaneDisplay","label Holds") ) .. { InitCommand=cmd(horizalign,right;x,-22;y,-12+16*2;shadowlengthx,0;shadowlengthy,2;shadowcolor,color("#000000AA");); }; LoadActor( THEME:GetPathG("PaneDisplay","label Mines") ) .. { InitCommand=cmd(horizalign,right;x,-22;y,-12+16*3;shadowlengthx,0;shadowlengthy,2;shadowcolor,color("#000000AA");); }; - LoadActor( THEME:GetPathG("PaneDisplay","label NumSteps") ) .. { + LoadActor( THEME:GetPathG("PaneDisplay","label Hands") ) .. { InitCommand=cmd(horizalign,right;x,-22;y,-12+16*4;shadowlengthx,0;shadowlengthy,2;shadowcolor,color("#000000AA");); }; LoadActor( THEME:GetPathG("PaneDisplay","label Rolls") ) .. { diff --git a/stepmania/src/ScreenEvaluation.cpp b/stepmania/src/ScreenEvaluation.cpp index 0fe4aee7b1..f76fc377fc 100644 --- a/stepmania/src/ScreenEvaluation.cpp +++ b/stepmania/src/ScreenEvaluation.cpp @@ -543,7 +543,7 @@ void ScreenEvaluation::Init() static const int indeces[NUM_DetailLine] = { - RadarCategory_Jumps, RadarCategory_Holds, RadarCategory_Mines, RadarCategory_Hands, RadarCategory_Rolls + RadarCategory_TapsAndHolds, RadarCategory_Jumps, RadarCategory_Holds, RadarCategory_Mines, RadarCategory_Hands, RadarCategory_Rolls }; const int ind = indeces[l]; const int iActual = lrintf(m_pStageStats->m_player[p].m_radarActual[ind]);