From 2380638072a93204dda00985e78ab33e05e99b5d Mon Sep 17 00:00:00 2001
From: Chris Danford <chrisdanford@users.sourceforge.net>
Date: Sun, 28 Dec 2003 08:20:48 +0000
Subject: [PATCH] cleanup ScreenRanking generalize scrolling lists with
 ListDisplay

---
 .../Fonts/ScreenRanking category.redir        |   1 +
 .../default/Fonts/ScreenRanking name.redir    |   1 +
 .../default/Fonts/ScreenRanking points.redir  |   1 +
 .../default/Fonts/ScreenRanking score.redir   |   1 +
 .../Fonts/ScreenRanking song title.redir      |   1 +
 .../Fonts/ScreenRanking steps score.redir     |   1 +
 .../Fonts/ScreenRanking steps type.redir      |   1 +
 .../default/Fonts/ScreenRanking time.redir    |   1 +
 .../Fonts/_ScreenRanking common 16x16.png     | Bin 0 -> 23017 bytes
 .../default/Fonts/_ScreenRanking common.ini   | 261 ++++++
 .../Graphics/ScreenRanking song frame.redir   |   1 +
 stepmania/Themes/default/metrics.ini          | 157 ++--
 stepmania/src/Actor.h                         |   1 +
 stepmania/src/ActorUtil.cpp                   |   4 +
 stepmania/src/GameState.cpp                   |   5 +
 stepmania/src/GameState.h                     |   5 +-
 stepmania/src/ListDisplay.cpp                 | 159 ++++
 stepmania/src/ListDisplay.h                   |  51 ++
 stepmania/src/ScreenRanking.cpp               | 769 ++++++++++--------
 stepmania/src/ScreenRanking.h                 |  43 +-
 stepmania/src/StepMania.dsp                   |  31 +-
 21 files changed, 1027 insertions(+), 468 deletions(-)
 create mode 100644 stepmania/Themes/default/Fonts/ScreenRanking category.redir
 create mode 100644 stepmania/Themes/default/Fonts/ScreenRanking name.redir
 create mode 100644 stepmania/Themes/default/Fonts/ScreenRanking points.redir
 create mode 100644 stepmania/Themes/default/Fonts/ScreenRanking score.redir
 create mode 100644 stepmania/Themes/default/Fonts/ScreenRanking song title.redir
 create mode 100644 stepmania/Themes/default/Fonts/ScreenRanking steps score.redir
 create mode 100644 stepmania/Themes/default/Fonts/ScreenRanking steps type.redir
 create mode 100644 stepmania/Themes/default/Fonts/ScreenRanking time.redir
 create mode 100644 stepmania/Themes/default/Fonts/_ScreenRanking common 16x16.png
 create mode 100644 stepmania/Themes/default/Fonts/_ScreenRanking common.ini
 create mode 100644 stepmania/Themes/default/Graphics/ScreenRanking song frame.redir
 create mode 100644 stepmania/src/ListDisplay.cpp
 create mode 100644 stepmania/src/ListDisplay.h

diff --git a/stepmania/Themes/default/Fonts/ScreenRanking category.redir b/stepmania/Themes/default/Fonts/ScreenRanking category.redir
new file mode 100644
index 0000000000..ba41a9d72b
--- /dev/null
+++ b/stepmania/Themes/default/Fonts/ScreenRanking category.redir	
@@ -0,0 +1 @@
+_shared2
diff --git a/stepmania/Themes/default/Fonts/ScreenRanking name.redir b/stepmania/Themes/default/Fonts/ScreenRanking name.redir
new file mode 100644
index 0000000000..58f4f9dfe6
--- /dev/null
+++ b/stepmania/Themes/default/Fonts/ScreenRanking name.redir	
@@ -0,0 +1 @@
+_ScreenRanking common
diff --git a/stepmania/Themes/default/Fonts/ScreenRanking points.redir b/stepmania/Themes/default/Fonts/ScreenRanking points.redir
new file mode 100644
index 0000000000..58f4f9dfe6
--- /dev/null
+++ b/stepmania/Themes/default/Fonts/ScreenRanking points.redir	
@@ -0,0 +1 @@
+_ScreenRanking common
diff --git a/stepmania/Themes/default/Fonts/ScreenRanking score.redir b/stepmania/Themes/default/Fonts/ScreenRanking score.redir
new file mode 100644
index 0000000000..58f4f9dfe6
--- /dev/null
+++ b/stepmania/Themes/default/Fonts/ScreenRanking score.redir	
@@ -0,0 +1 @@
+_ScreenRanking common
diff --git a/stepmania/Themes/default/Fonts/ScreenRanking song title.redir b/stepmania/Themes/default/Fonts/ScreenRanking song title.redir
new file mode 100644
index 0000000000..ba41a9d72b
--- /dev/null
+++ b/stepmania/Themes/default/Fonts/ScreenRanking song title.redir	
@@ -0,0 +1 @@
+_shared2
diff --git a/stepmania/Themes/default/Fonts/ScreenRanking steps score.redir b/stepmania/Themes/default/Fonts/ScreenRanking steps score.redir
new file mode 100644
index 0000000000..ba41a9d72b
--- /dev/null
+++ b/stepmania/Themes/default/Fonts/ScreenRanking steps score.redir	
@@ -0,0 +1 @@
+_shared2
diff --git a/stepmania/Themes/default/Fonts/ScreenRanking steps type.redir b/stepmania/Themes/default/Fonts/ScreenRanking steps type.redir
new file mode 100644
index 0000000000..ba41a9d72b
--- /dev/null
+++ b/stepmania/Themes/default/Fonts/ScreenRanking steps type.redir	
@@ -0,0 +1 @@
+_shared2
diff --git a/stepmania/Themes/default/Fonts/ScreenRanking time.redir b/stepmania/Themes/default/Fonts/ScreenRanking time.redir
new file mode 100644
index 0000000000..58f4f9dfe6
--- /dev/null
+++ b/stepmania/Themes/default/Fonts/ScreenRanking time.redir	
@@ -0,0 +1 @@
+_ScreenRanking common
diff --git a/stepmania/Themes/default/Fonts/_ScreenRanking common 16x16.png b/stepmania/Themes/default/Fonts/_ScreenRanking common 16x16.png
new file mode 100644
index 0000000000000000000000000000000000000000..6cc0d75096880cded3dfbbcebf07e84fda25d166
GIT binary patch
literal 23017
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
NaOi-mLya9i`9D~G+ztQ$

literal 0
HcmV?d00001

diff --git a/stepmania/Themes/default/Fonts/_ScreenRanking common.ini b/stepmania/Themes/default/Fonts/_ScreenRanking common.ini
new file mode 100644
index 0000000000..6da65676fe
--- /dev/null
+++ b/stepmania/Themes/default/Fonts/_ScreenRanking common.ini	
@@ -0,0 +1,261 @@
+[Char Widths]
+import=_20px fonts
+LineSpacing=24
+Top=7
+Baseline=27
+0=17
+1=17
+2=17
+3=17
+4=17
+5=17
+6=17
+7=17
+8=17
+9=120
+10=0
+11=17
+12=17
+13=0
+14=17
+15=17
+16=17
+17=17
+18=17
+19=17
+20=17
+21=17
+22=17
+23=17
+24=17
+25=17
+26=17
+27=17
+28=0
+29=0
+30=0
+31=0
+32=9
+33=9
+34=14
+35=18
+36=18
+37=27
+38=24
+39=8
+40=11
+41=11
+42=15
+43=18
+44=9
+45=9
+46=9
+47=8
+48=18
+49=18
+50=18
+51=18
+52=18
+53=18
+54=18
+55=18
+56=18
+57=18
+58=9
+59=9
+60=18
+61=18
+62=18
+63=17
+64=20
+65=21
+66=21
+67=21
+68=21
+69=20
+70=18
+71=22
+72=22
+73=11
+74=18
+75=22
+76=18
+77=25
+78=22
+79=22
+80=20
+81=22
+82=21
+83=20
+84=20
+85=22
+86=21
+87=27
+88=21
+89=21
+90=20
+91=11
+92=8
+93=11
+94=18
+95=14
+96=9
+97=18
+98=18
+99=18
+100=18
+101=18
+102=11
+103=18
+104=18
+105=9
+106=9
+107=18
+108=9
+109=27
+110=18
+111=18
+112=18
+113=18
+114=12
+115=17
+116=12
+117=18
+118=17
+119=25
+120=18
+121=17
+122=15
+123=11
+124=8
+125=11
+126=18
+127=17
+128=18
+129=10
+130=8
+131=18
+132=14
+133=27
+134=18
+135=18
+136=9
+137=27
+138=20
+139=9
+140=27
+141=10
+142=20
+143=10
+144=10
+145=8
+146=8
+147=14
+148=14
+149=14
+150=14
+151=27
+152=9
+153=26
+154=17
+155=9
+156=27
+157=10
+158=15
+159=21
+160=9
+161=9
+162=18
+163=18
+164=18
+165=18
+166=8
+167=18
+168=9
+169=22
+170=11
+171=18
+172=18
+173=9
+174=22
+175=14
+176=11
+177=18
+178=11
+179=11
+180=9
+181=18
+182=23
+183=9
+184=9
+185=11
+186=11
+187=18
+188=27
+189=27
+190=27
+191=17
+192=21
+193=21
+194=21
+195=21
+196=21
+197=21
+198=27
+199=21
+200=20
+201=20
+202=20
+203=20
+204=11
+205=11
+206=11
+207=11
+208=21
+209=22
+210=22
+211=22
+212=22
+213=22
+214=22
+215=18
+216=22
+217=22
+218=22
+219=22
+220=22
+221=21
+222=20
+223=18
+224=18
+225=18
+226=18
+227=18
+228=18
+229=18
+230=27
+231=18
+232=18
+233=18
+234=18
+235=18
+236=9
+237=9
+238=9
+239=9
+240=18
+241=18
+242=18
+243=18
+244=18
+245=18
+246=18
+247=18
+248=18
+249=18
+250=18
+251=18
+252=18
+253=17
+254=18
+255=17
diff --git a/stepmania/Themes/default/Graphics/ScreenRanking song frame.redir b/stepmania/Themes/default/Graphics/ScreenRanking song frame.redir
new file mode 100644
index 0000000000..04b2ead777
--- /dev/null
+++ b/stepmania/Themes/default/Graphics/ScreenRanking song frame.redir	
@@ -0,0 +1 @@
+_blank
\ No newline at end of file
diff --git a/stepmania/Themes/default/metrics.ini b/stepmania/Themes/default/metrics.ini
index 6e7d9191bd..86f97ea178 100644
--- a/stepmania/Themes/default/metrics.ini
+++ b/stepmania/Themes/default/metrics.ini
@@ -3434,67 +3434,81 @@ Unlock20X=250
 Unlock20Y=325
 
 [ScreenRanking]
+StepsTypesToHide=dance-couple,dance-solo,pump-halfdouble
+ShowCategories=1
+CoursesToShow=Courses/DDRMAX/NaokiStandard.crs,Courses/DDRMAX/ParanoiaBrothers.crs,Courses/Samples/PlayersBest1-4.crs
+ShowAllStepsScores=0
+DifficultiesToShow=easy,medium,hard,challenge
 NextScreen=ScreenUnlock
-CategoryX=517
-CategoryY=32
-CategoryWidth=222
-CategoryOnCommand=addx,640;sleep,0.0;bounceend,1;addx,-640
-CategoryOffCommand=sleep,0.0;linear,0.5;diffusealpha,0
+
+SecondsPerPage=10
+PageFadeSeconds=1.0
+EmptyScoreName=STEP
+NoScoreName=STEP
+
+RowSpacingX=0
+RowSpacingY=60
+ColSpacingX=0
+ColSpacingY=0
+StepsTypeColor1=0.6,0.6,1,1
+StepsTypeColor2=1,0.3,0.3,1
+StepsTypeColor3=0.3,1,0.3,1
+StepsTypeColor4=1.0,1,1.0,1
+StepsTypeColor5=1.0,1,1.0,1
+
 BannerX=517
 BannerY=44
-BannerWidth=220
-BannerHeight=58
-BannerOnCommand=addx,640;sleep,0.0;bounceend,1;addx,-640
+BannerOnCommand=scaletoclipped,220,58;addx,640;sleep,0.0;bounceend,1;addx,-640
 BannerOffCommand=sleep,0.0;linear,0.5;diffusealpha,0
 BannerFrameX=0
 BannerFrameY=0
 BannerFrameOnCommand=hidden,1
 BannerFrameOffCommand=
-TypeX=520
-TypeY=60
-TypeOnCommand=addx,640;sleep,0.0;bounceend,1;addx,-640
-TypeOffCommand=sleep,0.0;linear,0.5;diffusealpha,0
-LineSpacingX=0
-LineSpacingY=60
-BulletsStartX=100
-BulletsStartY=140
-Bullets1OnCommand=addx,640;sleep,0.2;bounceend,1;addx,-640
-Bullets2OnCommand=addx,640;sleep,0.3;bounceend,1;addx,-640
-Bullets3OnCommand=addx,640;sleep,0.4;bounceend,1;addx,-640
-Bullets4OnCommand=addx,640;sleep,0.5;bounceend,1;addx,-640
-Bullets5OnCommand=addx,640;sleep,0.6;bounceend,1;addx,-640
-Bullets1OffCommand=sleep,0.2;linear,0.5;diffusealpha,0
-Bullets2OffCommand=sleep,0.3;linear,0.5;diffusealpha,0
-Bullets3OffCommand=sleep,0.4;linear,0.5;diffusealpha,0
-Bullets4OffCommand=sleep,0.5;linear,0.5;diffusealpha,0
-Bullets5OffCommand=sleep,0.6;linear,0.5;diffusealpha,0
-TextZoom=1.0
-TextSongZoom=0.7
-TextColor=0.8,0.8,1,1
-NamesStartX=180
-NamesStartY=140
-Names1OnCommand=addx,640;sleep,0.2;bounceend,1;addx,-640
-Names2OnCommand=addx,640;sleep,0.3;bounceend,1;addx,-640
-Names3OnCommand=addx,640;sleep,0.4;bounceend,1;addx,-640
-Names4OnCommand=addx,640;sleep,0.5;bounceend,1;addx,-640
-Names5OnCommand=addx,640;sleep,0.6;bounceend,1;addx,-640
-Names1OffCommand=sleep,0.2;linear,0.5;diffusealpha,0
-Names2OffCommand=sleep,0.3;linear,0.5;diffusealpha,0
-Names3OffCommand=sleep,0.4;linear,0.5;diffusealpha,0
-Names4OffCommand=sleep,0.5;linear,0.5;diffusealpha,0
-Names5OffCommand=sleep,0.6;linear,0.5;diffusealpha,0
-ScoresStartX=520
-ScoresStartY=140 
-Scores1OnCommand=addx,640;sleep,0.2;bounceend,1;addx,-640
-Scores2OnCommand=addx,640;sleep,0.3;bounceend,1;addx,-640
-Scores3OnCommand=addx,640;sleep,0.4;bounceend,1;addx,-640
-Scores4OnCommand=addx,640;sleep,0.5;bounceend,1;addx,-640
-Scores5OnCommand=addx,640;sleep,0.6;bounceend,1;addx,-640
-Scores1OffCommand=sleep,0.2;linear,0.5;diffusealpha,0
-Scores2OffCommand=sleep,0.3;linear,0.5;diffusealpha,0
-Scores3OffCommand=sleep,0.4;linear,0.5;diffusealpha,0
-Scores4OffCommand=sleep,0.5;linear,0.5;diffusealpha,0
-Scores5OffCommand=sleep,0.6;linear,0.5;diffusealpha,0
+CategoryX=517
+CategoryY=32
+CategoryOnCommand=addx,640;sleep,0.0;bounceend,1;addx,-640
+CategoryOffCommand=sleep,0.0;linear,0.5;diffusealpha,0
+StepsTypeX=520
+StepsTypeY=60
+StepsTypeOnCommand=addx,640;sleep,0.0;bounceend,1;addx,-640
+StepsTypeOffCommand=sleep,0.0;linear,0.5;diffusealpha,0
+
+BulletStartX=100
+BulletStartY=140
+Bullet1OnCommand=addx,640;sleep,0.2;bounceend,1;addx,-640
+Bullet2OnCommand=addx,640;sleep,0.3;bounceend,1;addx,-640
+Bullet3OnCommand=addx,640;sleep,0.4;bounceend,1;addx,-640
+Bullet4OnCommand=addx,640;sleep,0.5;bounceend,1;addx,-640
+Bullet5OnCommand=addx,640;sleep,0.6;bounceend,1;addx,-640
+Bullet1OffCommand=sleep,0.2;linear,0.5;diffusealpha,0
+Bullet2OffCommand=sleep,0.3;linear,0.5;diffusealpha,0
+Bullet3OffCommand=sleep,0.4;linear,0.5;diffusealpha,0
+Bullet4OffCommand=sleep,0.5;linear,0.5;diffusealpha,0
+Bullet5OffCommand=sleep,0.6;linear,0.5;diffusealpha,0
+NameStartX=180
+NameStartY=140
+Name1OnCommand=horizalign,left;addx,640;sleep,0.2;bounceend,1;addx,-640
+Name2OnCommand=horizalign,left;addx,640;sleep,0.3;bounceend,1;addx,-640
+Name3OnCommand=horizalign,left;addx,640;sleep,0.4;bounceend,1;addx,-640
+Name4OnCommand=horizalign,left;addx,640;sleep,0.5;bounceend,1;addx,-640
+Name5OnCommand=horizalign,left;addx,640;sleep,0.6;bounceend,1;addx,-640
+Name1OffCommand=sleep,0.2;linear,0.5;diffusealpha,0
+Name2OffCommand=sleep,0.3;linear,0.5;diffusealpha,0
+Name3OffCommand=sleep,0.4;linear,0.5;diffusealpha,0
+Name4OffCommand=sleep,0.5;linear,0.5;diffusealpha,0
+Name5OffCommand=sleep,0.6;linear,0.5;diffusealpha,0
+ScoreStartX=520
+ScoreStartY=140 
+Score1OnCommand=horizalign,right;addx,640;sleep,0.2;bounceend,1;addx,-640
+Score2OnCommand=horizalign,right;addx,640;sleep,0.3;bounceend,1;addx,-640
+Score3OnCommand=horizalign,right;addx,640;sleep,0.4;bounceend,1;addx,-640
+Score4OnCommand=horizalign,right;addx,640;sleep,0.5;bounceend,1;addx,-640
+Score5OnCommand=horizalign,right;addx,640;sleep,0.6;bounceend,1;addx,-640
+Score1OffCommand=sleep,0.2;linear,0.5;diffusealpha,0
+Score2OffCommand=sleep,0.3;linear,0.5;diffusealpha,0
+Score3OffCommand=sleep,0.4;linear,0.5;diffusealpha,0
+Score4OffCommand=sleep,0.5;linear,0.5;diffusealpha,0
+Score5OffCommand=sleep,0.6;linear,0.5;diffusealpha,0
 PointsStartX=380
 PointsStartY=140
 Points1OnCommand=addx,640;sleep,0.2;bounceend,1;addx,-640
@@ -3519,43 +3533,6 @@ Time2OffCommand=sleep,0.3;linear,0.5;diffusealpha,0
 Time3OffCommand=sleep,0.4;linear,0.5;diffusealpha,0
 Time4OffCommand=sleep,0.5;linear,0.5;diffusealpha,0
 Time5OffCommand=sleep,0.6;linear,0.5;diffusealpha,0
-PercentStartX=170
-PercentStartY=140
-Percent1OnCommand=addx,640;sleep,0.2;bounceend,1;addx,-640
-Percent2OnCommand=addx,640;sleep,0.3;bounceend,1;addx,-640
-Percent3OnCommand=addx,640;sleep,0.4;bounceend,1;addx,-640
-Percent4OnCommand=addx,640;sleep,0.5;bounceend,1;addx,-640
-Percent5OnCommand=addx,640;sleep,0.6;bounceend,1;addx,-640
-Percent1OffCommand=sleep,0.2;linear,0.5;diffusealpha,0
-Percent2OffCommand=sleep,0.3;linear,0.5;diffusealpha,0
-Percent3OffCommand=sleep,0.4;linear,0.5;diffusealpha,0
-Percent4OffCommand=sleep,0.5;linear,0.5;diffusealpha,0
-Percent5OffCommand=sleep,0.6;linear,0.5;diffusealpha,0
-DifficultyStartX=170
-DifficultyStartY=96
-DifficultySpacingX=110
-DifficultySpacingY=0
-DifficultyOnCommand=addx,640;sleep,0.1;bounceend,1;addx,-640
-DifficultyOffCommand=sleep,0.1;linear,0.5;diffusealpha,0
-SecondsPerPage=5
-ShowCategories=1
-ShowSongScores=0
-NumSongsToShow=10
-CoursesToShow=Courses/DDRMAX/NaokiStandard.crs,Courses/DDRMAX/ParanoiaBrothers.crs,Courses/Samples/PlayersBest1-4.crs
-NotesTypesToHide=dance-couple,dance-solo,pump-halfdouble
-TextColor1=0.6,0.6,1,1
-TextColor2=1,0.3,0.3,1
-TextColor3=0.3,1,0.3,1
-EmptyScoreName=STEP
-NoScoreName=STEP
-DifficultiesToShow=easy,medium,hard,challenge
-PageFadeSeconds=1.0
-
-# Not all game types have NotesTypesToHide set, so add a few dummy colors
-# to prevent a crash.
-TextColor4=1.0,1,1.0,1
-TextColor5=1.0,1,1.0,1
-
 
 [ScreenSoundOptions]
 StyleIcon=0
diff --git a/stepmania/src/Actor.h b/stepmania/src/Actor.h
index f9c10fe1f7..fd5bacecdc 100644
--- a/stepmania/src/Actor.h
+++ b/stepmania/src/Actor.h
@@ -262,6 +262,7 @@ public:
 	//
 	// other properties
 	//
+	bool GetHidden()			{ return m_bHidden; }
 	void SetHidden( bool b )	{ m_bHidden = b; }
 	void SetShadowLength( float fLength );
 	void EnableShadow( bool b )	{ m_bShadow = b; }
diff --git a/stepmania/src/ActorUtil.cpp b/stepmania/src/ActorUtil.cpp
index 7b30af526d..dc242d9635 100644
--- a/stepmania/src/ActorUtil.cpp
+++ b/stepmania/src/ActorUtil.cpp
@@ -149,6 +149,10 @@ void UtilSetXY( Actor& actor, CString sClassName )
 
 float UtilCommand( Actor& actor, CString sClassName, CString sCommandName )
 {
+	// If Actor is hidden, it won't get updated or drawn, so don't bother tweening.
+	if( actor.GetHidden() )
+		return 0;
+
 	float ret = actor.Command( "playcommand," + sCommandName );
 
 	// HACK:  It's very often that we command things to TweenOffScreen 
diff --git a/stepmania/src/GameState.cpp b/stepmania/src/GameState.cpp
index 372e689152..7b11d391b7 100644
--- a/stepmania/src/GameState.cpp
+++ b/stepmania/src/GameState.cpp
@@ -159,6 +159,8 @@ void GameState::Reset()
 void GameState::BeginGame()
 {
 	m_timeGameStarted = time(NULL);
+
+	m_vpsNamesThatWereFilled.clear();
 }
 
 void GameState::EndGame()
@@ -1176,6 +1178,9 @@ void GameState::StoreRankingName( PlayerNumber pn, CString name )
 	for( unsigned i=0; i<aFeats.size(); i++ )
 	{
 		*aFeats[i].pStringToFill = name;
+
+		// save name pointers as we fill them
+		m_vpsNamesThatWereFilled.push_back( aFeats[i].pStringToFill );
 	}
 }
 
diff --git a/stepmania/src/GameState.h b/stepmania/src/GameState.h
index 2ca496e4ef..03b9396266 100644
--- a/stepmania/src/GameState.h
+++ b/stepmania/src/GameState.h
@@ -247,9 +247,8 @@ public:
 	};
 
 	void GetRankingFeats( PlayerNumber pn, vector<RankingFeats> &asFeatsOut );
-
-	/* Called by name entry screens: */
-	void StoreRankingName( PlayerNumber pn, CString name );
+	void StoreRankingName( PlayerNumber pn, CString name );	// Called by name entry screens
+	vector<CString*> m_vpsNamesThatWereFilled;	// filled on StoreRankingName, 
 
 	//
 	// Arrow positioning
diff --git a/stepmania/src/ListDisplay.cpp b/stepmania/src/ListDisplay.cpp
new file mode 100644
index 0000000000..214ae853ee
--- /dev/null
+++ b/stepmania/src/ListDisplay.cpp
@@ -0,0 +1,159 @@
+#include "global.h"
+/*
+-----------------------------------------------------------------------------
+ Class: ListDisplay
+
+ Desc: See header.
+
+ Copyright (c) 2001-2002 by the person(s) listed below.  All rights reserved.
+	Chris Danford
+-----------------------------------------------------------------------------
+*/
+
+#include "ListDisplay.h"
+#include "RageUtil.h"
+#include "GameConstantsAndTypes.h"
+#include "PrefsManager.h"
+#include "RageLog.h"
+#include "PrefsManager.h"
+#include "Course.h"
+#include "SongManager.h"
+#include <math.h>
+#include "ThemeManager.h"
+#include "Steps.h"
+#include "GameState.h"
+#include "StyleDef.h"
+#include "RageTexture.h"
+
+
+ListDisplay::ListDisplay()
+{
+	m_iNumItemsToShow = 0;
+	m_fItemWidth = 0;
+	m_fItemHeight = 0;
+	m_fItemAtTopOfList = 0;
+
+	m_quadMask.SetBlendMode( BLEND_NO_EFFECT );	// don't change color values
+	m_quadMask.SetUseZBuffer( true );	// we want to write to the Zbuffer
+}
+
+
+void ListDisplay::Load( 
+	const vector<Actor*> &m_vpItems, 
+	int iNumItemsToShow, 
+	float fItemWidth, 
+	float fItemHeight, 
+	bool bLoop, 
+	float fSecondsPerItem, 
+	float fSecondsPauseBetweenItems,
+	bool bSlide )
+{
+	ASSERT( iNumItemsToShow > 0 );
+	ASSERT( fItemWidth > 0 );
+	ASSERT( fItemHeight > 0 );
+	ASSERT( fSecondsPerItem > 0 );
+	ASSERT( fSecondsPauseBetweenItems >= 0 );
+
+	m_SubActors = m_vpItems;
+	m_iNumItemsToShow = iNumItemsToShow;
+	m_fItemWidth = fItemWidth;
+	m_fItemHeight = fItemHeight;
+	m_bLoop = bLoop; 
+	m_fSecondsPerItem = fSecondsPerItem; 
+	m_fSecondsPauseBetweenItems = fSecondsPauseBetweenItems;
+	m_bSlide = bSlide;
+	m_fItemAtTopOfList = m_bLoop ? 0 : -m_iNumItemsToShow;
+	m_fSecondsPauseCountdown = 0;
+
+	RectF rectBarSize(-m_fItemWidth/2, -m_fItemHeight/2,
+						m_fItemWidth/2, m_fItemHeight/2);
+	m_quadMask.StretchTo( rectBarSize );
+	m_quadMask.SetZ( 1 );
+}
+
+float ListDisplay::GetSecondsForCompleteScrollThrough()
+{
+	float fTotalItems = m_iNumItemsToShow + m_SubActors.size();
+	return fTotalItems * (m_fSecondsPerItem + m_fSecondsPauseBetweenItems );
+}
+
+void ListDisplay::Update( float fDeltaTime )
+{
+	ActorFrame::Update( fDeltaTime );
+
+	while( fDeltaTime > 0 )
+	{
+		// handle pause
+		if( fDeltaTime > m_fSecondsPauseCountdown )
+		{
+			fDeltaTime -= m_fSecondsPauseCountdown;
+			m_fSecondsPauseCountdown = 0;
+		}
+		else
+		{
+			m_fSecondsPauseCountdown -= fDeltaTime;
+			fDeltaTime = 0;
+			break;
+		}
+
+		// handle scrolling
+		float fPercentUntilNextItem = (int)m_fItemAtTopOfList+1 - m_fItemAtTopOfList;
+		float fSecsUntilNextItem = fPercentUntilNextItem * m_fSecondsPerItem;
+
+		if( fDeltaTime > fSecsUntilNextItem )
+		{
+			fDeltaTime -= fSecsUntilNextItem;
+			m_fItemAtTopOfList += fPercentUntilNextItem;
+		}
+		else
+		{
+			m_fItemAtTopOfList += fDeltaTime / m_fSecondsPerItem;
+			fDeltaTime = 0;
+			break;
+		}
+
+		if( m_bLoop )
+			wrap( m_fItemAtTopOfList, m_SubActors.size() );
+	}
+}
+
+void ListDisplay::DrawPrimitives()
+{
+	if( m_SubActors.empty() )
+		return;
+
+	// write to z buffer so that top and bottom are clipped
+	float fIndexFullyOnScreenTop = -(m_iNumItemsToShow-1)/2.f;
+	float fIndexFullyOnScreenBottom = (m_iNumItemsToShow-1)/2.f;
+	float fIndexCompletelyOffScreenTop = fIndexFullyOnScreenTop - 1;
+	float fIndexCompletelyOffScreenBottom = fIndexFullyOnScreenBottom + 1;
+
+	m_quadMask.SetY( fIndexCompletelyOffScreenTop * m_fItemHeight );
+	m_quadMask.Draw();
+	m_quadMask.SetY( fIndexCompletelyOffScreenBottom * m_fItemHeight );
+	m_quadMask.Draw();
+
+	int iItemToDraw = (int)m_fItemAtTopOfList;
+	float fRemainder = m_fItemAtTopOfList - (int)m_fItemAtTopOfList;
+	float fIndex = fIndexFullyOnScreenTop - fRemainder;
+	float fY = (fIndex)*m_fItemHeight;
+
+	for( int i=0; i<m_iNumItemsToShow+1; i++ )
+	{
+		if( iItemToDraw >= 0 && iItemToDraw < m_SubActors.size() )
+		{			
+			float fX = 0;
+			if( m_bSlide && fIndex>fIndexFullyOnScreenBottom-1 )
+				fX = SCALE( fIndex, fIndexFullyOnScreenBottom, fIndexFullyOnScreenBottom-1.f, 640.f, 0.f );
+			m_SubActors[iItemToDraw]->SetXY( roundf(fX), roundf(fY) );
+			m_SubActors[iItemToDraw]->Draw();
+		}
+		
+		iItemToDraw++;
+		if( m_bLoop )
+			wrap( iItemToDraw, m_SubActors.size() );
+		fY += m_fItemHeight;
+		fIndex += 1;
+	}
+}
+
diff --git a/stepmania/src/ListDisplay.h b/stepmania/src/ListDisplay.h
new file mode 100644
index 0000000000..e45614455f
--- /dev/null
+++ b/stepmania/src/ListDisplay.h
@@ -0,0 +1,51 @@
+#ifndef ListDisplay_H
+#define ListDisplay_H
+/*
+-----------------------------------------------------------------------------
+ Class: ListDisplay
+
+ Desc: Holds course name and banner.
+
+ Copyright (c) 2001-2002 by the person(s) listed below.  All rights reserved.
+	Chris Danford
+-----------------------------------------------------------------------------
+*/
+
+#include "ActorFrame.h"
+#include "Quad.h"
+
+class ListDisplay : public ActorFrame
+{
+public:
+	ListDisplay();
+
+	virtual void Update( float fDeltaTime );
+	virtual void DrawPrimitives();
+
+	void Load(
+		const vector<Actor*> &m_vpItems, 
+		int iNumItemsToShow, 
+		float fItemWidth, 
+		float fItemHeight, 
+		bool bLoop, 
+		float fSecondsPerItem, 
+		float fSecondsPauseBetweenItems,
+		bool bSlide );
+
+	float GetSecondsForCompleteScrollThrough();
+
+protected:
+	int		m_iNumItemsToShow;
+	float	m_fItemWidth;
+	float	m_fItemHeight;
+	bool	m_bLoop; 
+	float	m_fSecondsPerItem;
+	float	m_fSecondsPauseBetweenItems;
+	bool	m_bSlide;
+
+	float	m_fItemAtTopOfList;
+	float	m_fSecondsPauseCountdown;
+	Quad	m_quadMask;
+};
+
+#endif
diff --git a/stepmania/src/ScreenRanking.cpp b/stepmania/src/ScreenRanking.cpp
index 2d33e318b7..b3d1f59fb7 100644
--- a/stepmania/src/ScreenRanking.cpp
+++ b/stepmania/src/ScreenRanking.cpp
@@ -24,60 +24,57 @@
 #include "ActorUtil.h"
 #include "ProfileManager.h"
 
-static int g_iLastSongShown = 0;
 
-
-#define CATEGORY_WIDTH				THEME->GetMetricF("ScreenRanking","CategoryWidth")
-#define BANNER_WIDTH				THEME->GetMetricF("ScreenRanking","BannerWidth")
-#define BANNER_HEIGHT				THEME->GetMetricF("ScreenRanking","BannerHeight")
-#define LINE_SPACING_X				THEME->GetMetricF("ScreenRanking","LineSpacingX")
-#define LINE_SPACING_Y				THEME->GetMetricF("ScreenRanking","LineSpacingY")
-#define BULLETS_START_X				THEME->GetMetricF("ScreenRanking","BulletsStartX")
-#define BULLETS_START_Y				THEME->GetMetricF("ScreenRanking","BulletsStartY")
-#define BULLETS_ON_COMMAND( l )		THEME->GetMetric ("ScreenRanking",ssprintf("Bullets%dOnCommand",l+1))
-#define BULLETS_OFF_COMMAND( l )	THEME->GetMetric ("ScreenRanking",ssprintf("Bullets%dOffCommand",l+1))
-#define TEXT_ZOOM					THEME->GetMetricF("ScreenRanking","TextZoom")
-#define TEXT_SONGZOOM				THEME->GetMetricF("ScreenRanking","TextSongZoom")
-#define TEXT_COLOR( i )				THEME->GetMetricC("ScreenRanking",ssprintf("TextColor%d",i+1))
-#define NAMES_START_X				THEME->GetMetricF("ScreenRanking","NamesStartX")
-#define NAMES_START_Y				THEME->GetMetricF("ScreenRanking","NamesStartY")
-#define NAMES_ON_COMMAND( l )		THEME->GetMetric ("ScreenRanking",ssprintf("Names%dOnCommand",l+1))
-#define NAMES_OFF_COMMAND( l )		THEME->GetMetric ("ScreenRanking",ssprintf("Names%dOffCommand",l+1))
-#define SCORES_START_X				THEME->GetMetricF("ScreenRanking","ScoresStartX")
-#define SCORES_START_Y				THEME->GetMetricF("ScreenRanking","ScoresStartY")
-#define SCORES_ON_COMMAND( l )		THEME->GetMetric ("ScreenRanking",ssprintf("Scores%dOnCommand",l+1))
-#define SCORES_OFF_COMMAND( l )		THEME->GetMetric ("ScreenRanking",ssprintf("Scores%dOffCommand",l+1))
-#define POINTS_START_X				THEME->GetMetricF("ScreenRanking","PointsStartX")
-#define POINTS_START_Y				THEME->GetMetricF("ScreenRanking","PointsStartY")
-#define POINTS_ON_COMMAND( l )		THEME->GetMetric ("ScreenRanking",ssprintf("Points%dOnCommand",l+1))
-#define POINTS_OFF_COMMAND( l )		THEME->GetMetric ("ScreenRanking",ssprintf("Points%dOffCommand",l+1))
-#define TIME_START_X				THEME->GetMetricF("ScreenRanking","TimeStartX")
-#define TIME_START_Y				THEME->GetMetricF("ScreenRanking","TimeStartY")
-#define TIME_ON_COMMAND( l )		THEME->GetMetric ("ScreenRanking",ssprintf("Time%dOnCommand",l+1))
-#define TIME_OFF_COMMAND( l )		THEME->GetMetric ("ScreenRanking",ssprintf("Time%dOffCommand",l+1))
-#define PERCENT_START_X				THEME->GetMetricF("ScreenRanking","PercentStartX")
-#define PERCENT_START_Y				THEME->GetMetricF("ScreenRanking","PercentStartY")
-#define PERCENT_ON_COMMAND( l )		THEME->GetMetric ("ScreenRanking",ssprintf("Percent%dOnCommand",l+1))
-#define PERCENT_OFF_COMMAND( l )	THEME->GetMetric ("ScreenRanking",ssprintf("Percent%dOffCommand",l+1))
-#define PERCENT_DECIMAL_PLACES		THEME->GetMetricI("ScreenRanking","PercentDecimalPlaces")
-#define PERCENT_TOTAL_SIZE			THEME->GetMetricI("ScreenRanking","PercentTotalSize")
-#define DIFFICULTY_START_X			THEME->GetMetricF("ScreenRanking","DifficultyStartX")
-#define DIFFICULTY_START_Y			THEME->GetMetricF("ScreenRanking","DifficultyStartY")
-#define DIFFICULTY_SPACING_X		THEME->GetMetricF("ScreenRanking","DifficultySpacingX")
-#define DIFFICULTY_SPACING_Y		THEME->GetMetricF("ScreenRanking","DifficultySpacingY")
-#define DIFFICULTY_ON_COMMAND		THEME->GetMetric ("ScreenRanking","DifficultyOnCommand")
-#define DIFFICULTY_OFF_COMMAND		THEME->GetMetric ("ScreenRanking","DifficultyOffCommand")
+#define STEPS_TYPES_TO_HIDE			THEME->GetMetric ("ScreenRanking","StepsTypesToHide")
+#define SHOW_CATEGORIES				THEME->GetMetricB("ScreenRanking","ShowCategories")
+#define SHOW_ALL_STEPS_SCORES		THEME->GetMetricB("ScreenRanking","ShowAllStepsScores")
+#define DIFFICULTIES_TO_SHOW		THEME->GetMetric ("ScreenRanking","DifficultiesToShow")
+#define COURSES_TO_SHOW				PREFSMAN->m_sCoursesToShowRanking
 #define SECONDS_PER_PAGE			THEME->GetMetricF("ScreenRanking","SecondsPerPage")
 #define PAGE_FADE_SECONDS			THEME->GetMetricF("ScreenRanking","PageFadeSeconds")
-#define SHOW_CATEGORIES				THEME->GetMetricB("ScreenRanking","ShowCategories")
-#define SHOW_SONG_SCORES			THEME->GetMetricB("ScreenRanking","ShowSongScores")
-#define NUM_SONGS_TO_SHOW			THEME->GetMetricI("ScreenRanking","NumSongsToShow")
-#define NOTES_TYPES_TO_HIDE			THEME->GetMetric ("ScreenRanking","NotesTypesToHide")
+#define PERCENT_DECIMAL_PLACES		THEME->GetMetricI("ScreenRanking","PercentDecimalPlaces")
+#define PERCENT_TOTAL_SIZE			THEME->GetMetricI("ScreenRanking","PercentTotalSize")
 #define EMPTY_SCORE_NAME			THEME->GetMetric ("ScreenRanking","EmptyScoreName")
 #define NO_SCORE_NAME				THEME->GetMetric ("ScreenRanking","NoScoreName")
-#define DIFFICULTIES_TO_SHOW		THEME->GetMetric ("ScreenRanking","DifficultiesToShow")
 
-#define COURSES_TO_SHOW			PREFSMAN->m_sCoursesToShowRanking
+#define ROW_SPACING_X				THEME->GetMetricF("ScreenRanking","RowSpacingX")
+#define ROW_SPACING_Y				THEME->GetMetricF("ScreenRanking","RowSpacingY")
+#define COL_SPACING_X				THEME->GetMetricF("ScreenRanking","ColSpacingX")
+#define COL_SPACING_Y				THEME->GetMetricF("ScreenRanking","ColSpacingY")
+#define STEPS_TYPE_COLOR( i )		THEME->GetMetricC("ScreenRanking",ssprintf("StepsTypeColor%d",i+1))
+#define NUM_ROW_ITEMS_TO_SHOW		THEME->GetMetricI("ScreenRanking","NumRowItemsToShow")
+
+#define BULLET_START_X				THEME->GetMetricF("ScreenRanking","BulletStartX")
+#define BULLET_START_Y				THEME->GetMetricF("ScreenRanking","BulletStartY")
+#define NAME_START_X				THEME->GetMetricF("ScreenRanking","NameStartX")
+#define NAME_START_Y				THEME->GetMetricF("ScreenRanking","NameStartY")
+#define SCORE_START_X				THEME->GetMetricF("ScreenRanking","ScoreStartX")
+#define SCORE_START_Y				THEME->GetMetricF("ScreenRanking","ScoreStartY")
+#define POINTS_START_X				THEME->GetMetricF("ScreenRanking","PointsStartX")
+#define POINTS_START_Y				THEME->GetMetricF("ScreenRanking","PointsStartY")
+#define TIME_START_X				THEME->GetMetricF("ScreenRanking","TimeStartX")
+#define TIME_START_Y				THEME->GetMetricF("ScreenRanking","TimeStartY")
+#define DIFFICULTY_START_X			THEME->GetMetricF("ScreenRanking","DifficultyStartX")
+#define DIFFICULTY_Y				THEME->GetMetricF("ScreenRanking","DifficultyY")
+#define SONG_TITLE_OFFSET_X			THEME->GetMetricF("ScreenRanking","SongTitleOffsetX")
+#define SONG_TITLE_OFFSET_Y			THEME->GetMetricF("ScreenRanking","SongTitleOffsetY")
+#define SONG_FRAME_OFFSET_X			THEME->GetMetricF("ScreenRanking","SongFrameOffsetX")
+#define SONG_FRAME_OFFSET_Y			THEME->GetMetricF("ScreenRanking","SongFrameOffsetY")
+#define STEPS_SCORE_OFFSET_START_X	THEME->GetMetricF("ScreenRanking","StepsScoreOffsetStartX")
+#define STEPS_SCORE_OFFSET_Y		THEME->GetMetricF("ScreenRanking","StepsScoreOffsetY")
+
+#define BULLET_X(row)				(BULLET_START_X+ROW_SPACING_X*row)
+#define BULLET_Y(row)				(BULLET_START_Y+ROW_SPACING_Y*row)
+#define NAME_X(row)					(NAME_START_X+ROW_SPACING_X*row)
+#define NAME_Y(row)					(NAME_START_Y+ROW_SPACING_Y*row)
+#define SCORE_X(row)				(SCORE_START_X+ROW_SPACING_X*row)
+#define SCORE_Y(row)				(SCORE_START_Y+ROW_SPACING_Y*row)
+#define POINTS_X(row)				(POINTS_START_X+ROW_SPACING_X*row)
+#define POINTS_Y(row)				(POINTS_START_Y+ROW_SPACING_Y*row)
+#define TIME_X(row)					(TIME_START_X+ROW_SPACING_X*row)
+#define TIME_Y(row)					(TIME_START_Y+ROW_SPACING_Y*row)
+#define DIFFICULTY_X(col)			(DIFFICULTY_START_X+COL_SPACING_X*col)
+#define STEPS_SCORE_OFFSET_X(col)	(STEPS_SCORE_OFFSET_START_X+COL_SPACING_X*col)
 
 const ScreenMessage SM_ShowNextPage		=	(ScreenMessage)(SM_User+67);
 const ScreenMessage SM_HidePage			=	(ScreenMessage)(SM_User+68);
@@ -85,105 +82,147 @@ const ScreenMessage SM_HidePage			=	(ScreenMessage)(SM_User+68);
 
 ScreenRanking::ScreenRanking( CString sClassName ) : ScreenAttract( sClassName )
 {
-	m_sprCategory.SetName( "Category" );
-	this->AddChild( &m_sprCategory );
-
-	m_banner.SetName( "Banner" );
-	this->AddChild( &m_banner );
-
-	m_sprBannerFrame.SetName( "BannerFrame" );
-	this->AddChild( &m_sprBannerFrame );
-
-	m_textCategory.SetName( "Category" );
-	m_textCategory.LoadFromFont( THEME->GetPathToF("ScreenRanking title") );
-	m_textCategory.EnableShadow( false );
-	this->AddChild( &m_textCategory );
-
-	m_sprType.SetName( "Type" );
-	this->AddChild( &m_sprType );
-
-
-	// make the list of difficulties to show
-	vector<CString> sShowDiffs;
-	split( DIFFICULTIES_TO_SHOW, ",", sShowDiffs, true );
-
-	for( vector<CString>::const_iterator iter = sShowDiffs.begin(); iter != sShowDiffs.end(); iter++ )
+	// init Actors for category and course
 	{
-		m_vDiffsToShow.push_back( StringToDifficulty( *iter ) );
-	}
-	
+		m_Banner.SetName( "Banner" );
+		m_Banner.SetHidden( true );
+		this->AddChild( &m_Banner );
 
-	for( int l=0; l<NUM_RANKING_LINES; l++ )
-	{
-		m_sprBullets[l].Load( THEME->GetPathToG("ScreenRanking bullets 1x5") );
-		m_sprBullets[l].SetDiffuseAlpha( 0 );
-		this->AddChild( &m_sprBullets[l] );
+		m_sprBannerFrame.SetName( "BannerFrame" );
+		m_sprBannerFrame.SetHidden( true );
+		this->AddChild( &m_sprBannerFrame );
 
-		m_textNames[l].LoadFromFont( THEME->GetPathToF("ScreenRanking letters") );
-		m_textNames[l].SetDiffuseAlpha( 0 );
-		this->AddChild( &m_textNames[l] );
+		m_textCategory.SetName( "Category" );
+		m_textCategory.LoadFromFont( THEME->GetPathToF("ScreenRanking category") );
+		m_textCategory.EnableShadow( false );
+		m_textCategory.SetHidden( true );
+		this->AddChild( &m_textCategory );
 
-		m_textScores[l].LoadFromFont( THEME->GetPathToF("ScreenRanking letters") );
-		m_textScores[l].SetDiffuseAlpha( 0 );
-		this->AddChild( &m_textScores[l] );
+		m_textStepsType.SetName( "StepsType" );
+		m_textStepsType.LoadFromFont( THEME->GetPathToF("ScreenRanking steps type") );
+		m_textStepsType.EnableShadow( false );
+		m_textStepsType.SetHidden( true );
+		this->AddChild( &m_textStepsType );
 
-		m_textPoints[l].LoadFromFont( THEME->GetPathToF("ScreenRanking letters") );
-		m_textPoints[l].SetDiffuseAlpha( 0 );
-		this->AddChild( &m_textPoints[l] );
-		
-		m_textTime[l].LoadFromFont( THEME->GetPathToF("ScreenRanking letters") );
-		m_textTime[l].SetDiffuseAlpha( 0 );
-		this->AddChild( &m_textTime[l] );
-
-		if( PREFSMAN->m_sCoursesToShowRanking == "" )
-			PREFSMAN->m_sCoursesToShowRanking = THEME->GetMetric("ScreenRanking","CoursesToShow");
-	}
-
-
-	// init all the difficulty graphics
-	for( int d=0; d<NUM_DIFFICULTIES; d++ )
-	{
-		bool bShowThis = find(m_vDiffsToShow.begin(), m_vDiffsToShow.end(), d) != m_vDiffsToShow.end();
-
-		m_sprDiffHeaders[d].Load( THEME->GetPathToG(("ScreenRanking difficulty 1x5")) );
-		m_sprDiffHeaders[d].SetDiffuseAlpha( 0 );
-		if( bShowThis )
-			this->AddChild( &m_sprDiffHeaders[d] );
 
 		for( int l=0; l<NUM_RANKING_LINES; l++ )
 		{
-			m_textPercent[l][d].LoadFromFont( THEME->GetPathToF("ScreenRanking letters") );
-			m_textPercent[l][d].SetDiffuseAlpha( 0 );
-			if( bShowThis )
-				this->AddChild( &m_textPercent[l][d] );
+			m_sprBullets[l].SetName( ssprintf("Bullet%d",l+1) );
+			m_sprBullets[l].Load( THEME->GetPathToG( ssprintf("ScreenRanking bullets 1x%d",NUM_RANKING_LINES) ) );
+			m_sprBullets[l].SetState( l );
+			m_sprBullets[l].StopAnimating();
+			m_sprBullets[l].SetHidden( true );
+			this->AddChild( &m_sprBullets[l] );
+
+			m_textNames[l].SetName( ssprintf("Name%d",l+1) );
+			m_textNames[l].LoadFromFont( THEME->GetPathToF("ScreenRanking name") );
+			m_textNames[l].SetHidden( true );
+			this->AddChild( &m_textNames[l] );
+
+			m_textScores[l].SetName( ssprintf("Score%d",l+1) );
+			m_textScores[l].LoadFromFont( THEME->GetPathToF("ScreenRanking score") );
+			m_textScores[l].SetHidden( true );
+			this->AddChild( &m_textScores[l] );
+
+			m_textPoints[l].SetName( ssprintf("Points%d",l+1) );
+			m_textPoints[l].LoadFromFont( THEME->GetPathToF("ScreenRanking points") );
+			m_textPoints[l].SetHidden( true );
+			this->AddChild( &m_textPoints[l] );
+			
+			m_textTime[l].SetName( ssprintf("Time%d",l+1) );
+			m_textTime[l].LoadFromFont( THEME->GetPathToF("ScreenRanking time") );
+			m_textTime[l].SetHidden( true );
+			this->AddChild( &m_textTime[l] );
+
+			// TODO: Think of a better way to handle this
+			if( PREFSMAN->m_sCoursesToShowRanking == "" )
+				PREFSMAN->m_sCoursesToShowRanking = THEME->GetMetric("ScreenRanking","CoursesToShow");
 		}
 	}
 
-
-	vector<StepsType> aNotesTypesToShow;
-	GAMEMAN->GetNotesTypesForGame( GAMESTATE->m_CurGame, aNotesTypesToShow );
-
-	// subtract hidden NotesTypes
+	// make the list of difficulties to show
 	{
-		vector<CString> asNotesTypesToHide;
-		split( NOTES_TYPES_TO_HIDE, ",", asNotesTypesToHide, true );
-		for( unsigned i=0; i<asNotesTypesToHide.size(); i++ )
+		vector<CString> sShowDiffs;
+		split( DIFFICULTIES_TO_SHOW, ",", sShowDiffs, true );
+
+		for( vector<CString>::const_iterator iter = sShowDiffs.begin(); iter != sShowDiffs.end(); iter++ )
 		{
-			StepsType nt = GameManager::StringToNotesType(asNotesTypesToHide[i]);
-			if( nt != STEPS_TYPE_INVALID )
+			m_vDiffsToShow.push_back( StringToDifficulty( *iter ) );
+		}
+	}
+
+	// init Actors for all_steps
+	{
+		const unsigned num_songs = SONGMAN->GetAllSongs().size();
+		for( int d=0; d<NUM_DIFFICULTIES; d++ )
+		{
+			bool bShowThis = find(m_vDiffsToShow.begin(), m_vDiffsToShow.end(), d) != m_vDiffsToShow.end();
+			if( !bShowThis )
+				continue;	// skip
+
+			m_sprDifficulty[d].SetName( ssprintf("Difficulty%d",d) );
+			m_sprDifficulty[d].Load( THEME->GetPathToG(ssprintf("ScreenRanking difficulty 1x%d",NUM_DIFFICULTIES)) );
+			m_sprDifficulty[d].SetHidden( true );
+			this->AddChild( &m_sprDifficulty[d] );
+		}
+		for( int s=0; s<num_songs; s++ )
+		{
+			StepsScoreRowItem* pStepsScoreRowItem = new StepsScoreRowItem;
+
+			pStepsScoreRowItem->m_sprSongFrame.SetName( "SongFrame" );
+			pStepsScoreRowItem->m_sprSongFrame.SetHidden( true );
+			pStepsScoreRowItem->m_sprSongFrame.Load( THEME->GetPathToG("ScreenRanking song frame") );
+			pStepsScoreRowItem->AddChild( &pStepsScoreRowItem->m_sprSongFrame );
+
+			pStepsScoreRowItem->m_textSongTitle.SetName( "SongTitle" );
+			pStepsScoreRowItem->m_textSongTitle.SetHidden( true );
+			pStepsScoreRowItem->m_textSongTitle.LoadFromFont( THEME->GetPathToF("ScreenRanking song title") );
+			pStepsScoreRowItem->AddChild( &pStepsScoreRowItem->m_textSongTitle );
+
+			for( int d=0; d<NUM_DIFFICULTIES; d++ )
 			{
-				const vector<StepsType>::iterator iter = find( aNotesTypesToShow.begin(), aNotesTypesToShow.end(), nt );
-				if( iter != aNotesTypesToShow.end() )
-					aNotesTypesToShow.erase( iter );
+				pStepsScoreRowItem->m_textStepsScore[d].SetName( "StepsScore" );
+				pStepsScoreRowItem->m_textStepsScore[d].LoadFromFont( THEME->GetPathToF("ScreenRanking steps score") );
+				pStepsScoreRowItem->m_textStepsScore[d].SetHidden( true );
+				pStepsScoreRowItem->AddChild( &pStepsScoreRowItem->m_textStepsScore[d] );
+			}
+
+			m_vpStepsScoreRowItem.push_back( pStepsScoreRowItem );
+		}
+
+		m_ListScoreRowItems.SetName( "ListScoreRowItems" );
+		this->AddChild( &m_ListScoreRowItems );
+		m_ListScoreRowItems.SetXY( CENTER_X, CENTER_Y );
+	}
+
+	// calculate which StepsTypes to show
+	vector<StepsType> aStepsTypesToShow;
+	{
+		GAMEMAN->GetNotesTypesForGame( GAMESTATE->m_CurGame, aStepsTypesToShow );
+
+		// subtract hidden StepsTypes
+		{
+			vector<CString> asStepsTypesToHide;
+			split( STEPS_TYPES_TO_HIDE, ",", asStepsTypesToHide, true );
+			for( unsigned i=0; i<asStepsTypesToHide.size(); i++ )
+			{
+				StepsType nt = GameManager::StringToNotesType(asStepsTypesToHide[i]);
+				if( nt != STEPS_TYPE_INVALID )
+				{
+					const vector<StepsType>::iterator iter = find( aStepsTypesToShow.begin(), aStepsTypesToShow.end(), nt );
+					if( iter != aStepsTypesToShow.end() )
+						aStepsTypesToShow.erase( iter );
+				}
 			}
 		}
 	}
 
-
+	//
 	// fill m_vPagesToShow
+	//
 	if( SHOW_CATEGORIES )
 	{
-		for( unsigned i=0; i<aNotesTypesToShow.size(); i++ )
+		for( unsigned i=0; i<aStepsTypesToShow.size(); i++ )
 		{
 			for( int c=0; c<NUM_RANKING_CATEGORIES; c++ )
 			{
@@ -191,7 +230,7 @@ ScreenRanking::ScreenRanking( CString sClassName ) : ScreenAttract( sClassName )
 				pts.type = PageToShow::TYPE_CATEGORY;
 				pts.colorIndex = i;
 				pts.category = (RankingCategory)c;
-				pts.nt = aNotesTypesToShow[i];
+				pts.nt = aStepsTypesToShow[i];
 				m_vPagesToShow.push_back( pts );
 			}
 		}
@@ -200,14 +239,14 @@ ScreenRanking::ScreenRanking( CString sClassName ) : ScreenAttract( sClassName )
 	{
 		vector<CString> asCoursePaths;
 		split( COURSES_TO_SHOW, ",", asCoursePaths, true );
-		for( unsigned i=0; i<aNotesTypesToShow.size(); i++ )
+		for( unsigned i=0; i<aStepsTypesToShow.size(); i++ )
 		{
 			for( unsigned c=0; c<asCoursePaths.size(); c++ )
 			{
 				PageToShow pts;
 				pts.type = PageToShow::TYPE_COURSE;
 				pts.colorIndex = i;
-				pts.nt = aNotesTypesToShow[i];
+				pts.nt = aStepsTypesToShow[i];
 				pts.pCourse = SONGMAN->GetCourseFromPath( asCoursePaths[c] );
 				if( pts.pCourse )
 					m_vPagesToShow.push_back( pts );
@@ -215,33 +254,18 @@ ScreenRanking::ScreenRanking( CString sClassName ) : ScreenAttract( sClassName )
 		}
 	}
 
-	if( SHOW_SONG_SCORES )
+	if( SHOW_ALL_STEPS_SCORES )
 	{
 		vector<Song*> vpSongs = SONGMAN->GetAllSongs();
 		if( !vpSongs.empty() )
 		{
-			for( unsigned i=0; i<aNotesTypesToShow.size(); i++ )
+			for( unsigned i=0; i<aStepsTypesToShow.size(); i++ )
 			{
-				/* Wrap first; the number of songs can change if we reload. */
-				wrap( g_iLastSongShown,vpSongs.size() ); 
-
-				int FirstSongShown = g_iLastSongShown;
-
-				for( int j=0; j<NUM_SONGS_TO_SHOW; j++ )
-				{
-					PageToShow pts;
-					pts.type = PageToShow::TYPE_SONG;
-					pts.colorIndex = i;
-					pts.pSong = vpSongs[g_iLastSongShown];
-					pts.nt = aNotesTypesToShow[i];
-					m_vPagesToShow.push_back( pts );
-					
-					g_iLastSongShown++;
-					wrap( g_iLastSongShown,vpSongs.size() ); 
-
-					if( g_iLastSongShown == FirstSongShown )
-						break; /* don't show songs twice */
-				}
+				PageToShow pts;
+				pts.type = PageToShow::TYPE_ALL_STEPS;
+				pts.colorIndex = i;
+				pts.nt = aStepsTypesToShow[i];
+				m_vPagesToShow.push_back( pts );
 			}
 		}
 	}
@@ -254,20 +278,25 @@ ScreenRanking::ScreenRanking( CString sClassName ) : ScreenAttract( sClassName )
 	this->PostScreenMessage( SM_ShowNextPage, 0.5f );
 }
 
+ScreenRanking::~ScreenRanking()
+{
+	const unsigned num_songs = SONGMAN->GetAllSongs().size();
+
+	// delete dynamically allocated members
+	for( int s=0; s<num_songs; s++ )
+		delete m_vpStepsScoreRowItem[s];
+}
+
 void ScreenRanking::HandleScreenMessage( const ScreenMessage SM )
 {
 	switch( SM )
 	{
-		// redundant
-//	case SM_BeginFadingOut:
-//		m_Out.CloseWipingRight(SM_GoToNextScreen);
-//		break;
 	case SM_ShowNextPage:
 		if( m_vPagesToShow.size() > 0 )
 		{
-			SetPage( m_vPagesToShow[0] );
+			float fSecsToShow = SetPage( m_vPagesToShow[0] );
 			m_vPagesToShow.erase( m_vPagesToShow.begin() );
-			this->PostScreenMessage( SM_HidePage, SECONDS_PER_PAGE-PAGE_FADE_SECONDS );
+			this->PostScreenMessage( SM_HidePage, fSecsToShow-PAGE_FADE_SECONDS );
 		}
 		else
 		{
@@ -283,172 +312,230 @@ void ScreenRanking::HandleScreenMessage( const ScreenMessage SM )
 	ScreenAttract::HandleScreenMessage( SM );
 }
 
-void ScreenRanking::SetPage( PageToShow pts )
+float ScreenRanking::SetPage( PageToShow pts )
 {
-	bool bShowNames=false, bShowScores=false, bShowPoints=false, bShowTime=false, bShowDifficulty=false, bShowPercent=false;
+	bool bBanner = false; 
+	bool bBannerFrame = false;
+	bool bShowCategory = false; 
+	bool bShowStepsType = false; 
+	bool bShowBullets = false; 
+	bool bShowNames = false;
+	bool bShowScores = false; 
+	bool bShowPoints = false; 
+	bool bShowTime = false;
+	bool bShowDifficulty = false; 
+	bool bShowStepsScore = false;
 	switch( pts.type )
 	{
 	case PageToShow::TYPE_CATEGORY:
+		bBanner = false; 
+		bBannerFrame = false;
+		bShowCategory = true;
+		bShowStepsType = true;
+		bShowBullets = true;
 		bShowNames = true;
 		bShowScores = true;
 		bShowPoints = false;
 		bShowTime = false;
 		bShowDifficulty = false;
-		bShowPercent = false;
+		bShowStepsScore = false;
 		break;
 	case PageToShow::TYPE_COURSE:
+		bBanner = true; 
+		bBannerFrame = true;
+		bShowCategory = false;
+		bShowStepsType = true;
+		bShowBullets = true;
 		bShowNames = true;
 		bShowScores = !pts.pCourse->IsOni();
 		bShowPoints = pts.pCourse->IsOni();
 		bShowTime = pts.pCourse->IsOni();
 		bShowDifficulty = false;
-		bShowPercent = false;
+		bShowStepsScore = false;
 		break;
-	case PageToShow::TYPE_SONG:
+	case PageToShow::TYPE_ALL_STEPS:
+		bBanner = false; 
+		bBannerFrame = false;
+		bShowCategory = false;
+		bShowStepsType = true;
+		bShowBullets = false;
 		bShowNames = false;
 		bShowScores = false;
 		bShowPoints = false;
 		bShowTime = false;
 		bShowDifficulty = true;
-		bShowPercent = true;
+		bShowStepsScore = true;
 		break;
 	default:
 		ASSERT(0);
 	}
 
 
-	int l, d;
-
 	// Reset
-	m_sprCategory.Reset();
-	SET_XY_AND_ON_COMMAND( m_sprCategory );
-	m_banner.Reset();
-	SET_XY_AND_ON_COMMAND( m_banner );
-	m_sprBannerFrame.Reset();
-	SET_XY_AND_ON_COMMAND( m_sprBannerFrame );
-	m_textCategory.Reset();
-	SET_XY_AND_ON_COMMAND( m_textCategory );
-	m_sprType.Reset();
-	SET_XY_AND_ON_COMMAND( m_sprType );
-	
-	for( l=0; l<NUM_RANKING_LINES; l++ )
+	m_Banner.SetHidden( !bBanner );
+	if( bBanner )
 	{
-		m_sprBullets[l].Reset();
-		m_sprBullets[l].SetXY( BULLETS_START_X+LINE_SPACING_X*l, BULLETS_START_Y+LINE_SPACING_Y*l );
-		m_sprBullets[l].StopAnimating();
-		m_sprBullets[l].SetState(l);
-		m_sprBullets[l].Command( BULLETS_ON_COMMAND(l) );
-
-		m_textNames[l].Reset();
-		m_textNames[l].SetXY( NAMES_START_X+LINE_SPACING_X*l, NAMES_START_Y+LINE_SPACING_Y*l );
-		m_textNames[l].SetZoom( TEXT_ZOOM );
-		m_textNames[l].SetDiffuseAlpha( 0 );
-		m_textNames[l].EnableShadow( false );
-		m_textNames[l].SetHorizAlign( Actor::align_left );
-		if( bShowNames )
-		{
-			m_textNames[l].SetDiffuse( TEXT_COLOR(pts.colorIndex) );
-			m_textNames[l].Command( NAMES_ON_COMMAND(l) );
-		}
-
-		m_textScores[l].Reset();
-		m_textScores[l].SetXY( SCORES_START_X+LINE_SPACING_X*l, SCORES_START_Y+LINE_SPACING_Y*l );
-		m_textScores[l].SetZoom( TEXT_ZOOM );
-		m_textScores[l].SetDiffuseAlpha( 0 );
-		m_textScores[l].EnableShadow( false );
-		m_textScores[l].SetHorizAlign( Actor::align_right );
-		if( bShowScores )
-		{
-			m_textScores[l].SetDiffuse( TEXT_COLOR(pts.colorIndex) );
-			m_textScores[l].Command( SCORES_ON_COMMAND(l) );
-		}
-
-		m_textPoints[l].Reset();
-		m_textPoints[l].SetXY( POINTS_START_X+LINE_SPACING_X*l, POINTS_START_Y+LINE_SPACING_Y*l );
-		m_textPoints[l].SetZoom( TEXT_ZOOM );
-		m_textPoints[l].SetDiffuseAlpha( 0 );
-		m_textPoints[l].EnableShadow( false );
-		m_textPoints[l].SetHorizAlign( Actor::align_right );
-		if( bShowPoints )
-		{
-			m_textPoints[l].SetDiffuse( TEXT_COLOR(pts.colorIndex) );
-			m_textPoints[l].Command( POINTS_ON_COMMAND(l) );
-		}
-
-		m_textTime[l].Reset();
-		m_textTime[l].SetXY( TIME_START_X+LINE_SPACING_X*l, TIME_START_Y+LINE_SPACING_Y*l );
-		m_textTime[l].SetZoom( TEXT_ZOOM );
-		m_textTime[l].SetDiffuseAlpha( 0 );
-		m_textTime[l].EnableShadow( false );
-		m_textTime[l].SetHorizAlign( Actor::align_right );
-		if( bShowTime )
-		{
-			m_textTime[l].SetDiffuse( TEXT_COLOR(pts.colorIndex) );
-			m_textTime[l].Command( TIME_ON_COMMAND(l) );
-		}
+		m_Banner.Reset();
+		SET_XY_AND_ON_COMMAND( m_Banner );
 	}
 
-	for( d=0; d<NUM_DIFFICULTIES; d++ )
+	m_sprBannerFrame.SetHidden( !bBannerFrame );
+	if( bBannerFrame )
 	{
-		m_sprDiffHeaders[d].Reset();
-		m_sprDiffHeaders[d].SetXY( DIFFICULTY_START_X+DIFFICULTY_SPACING_X*d, DIFFICULTY_START_Y+DIFFICULTY_SPACING_Y*d );
-		m_sprDiffHeaders[d].SetDiffuseAlpha( 0 );
-		m_sprDiffHeaders[d].StopAnimating();
-		m_sprDiffHeaders[d].SetState(d);
-		if( bShowDifficulty )
-		{
-			m_sprDiffHeaders[d].SetDiffuseAlpha( 1 );
-			m_sprDiffHeaders[d].Command( DIFFICULTY_ON_COMMAND );
-		}
+		m_sprBannerFrame.Reset();
+		SET_XY_AND_ON_COMMAND( m_sprBannerFrame );
+	}
 
+	m_textCategory.SetHidden( !bShowCategory );
+	if( bShowCategory )
+	{
+		m_textCategory.Reset();
+		SET_XY_AND_ON_COMMAND( m_textCategory );
+	}
+
+	m_textStepsType.SetHidden( !bShowStepsType );
+	if( bShowStepsType )
+	{
+		m_textStepsType.Reset();
+		SET_XY_AND_ON_COMMAND( m_textStepsType );
+	}
+
+	{
 		for( int l=0; l<NUM_RANKING_LINES; l++ )
 		{
-			m_textPercent[l][d].Reset();
-			m_textPercent[l][d].SetZoom( TEXT_SONGZOOM );
-			m_textPercent[l][d].SetXY( PERCENT_START_X+DIFFICULTY_SPACING_X*d, PERCENT_START_Y+LINE_SPACING_Y*l );
-			m_textPercent[l][d].SetDiffuseAlpha( 0 );
-			m_textPercent[l][d].EnableShadow( false );
-			if( bShowPercent )
+			m_sprBullets[l].SetHidden( !bShowBullets );
+			if( bShowBullets )
 			{
-				m_textPercent[l][d].SetDiffuse( TEXT_COLOR(pts.colorIndex) );
-				m_textPercent[l][d].Command( PERCENT_ON_COMMAND(l) );
+				m_sprBullets[l].Reset();
+				m_sprBullets[l].StopAnimating();
+				m_sprBullets[l].SetState( l );
+				m_sprBullets[l].SetXY( BULLET_X(l), BULLET_Y(l) );
+				ON_COMMAND( m_sprBullets[l] );
+			}
+
+			m_textNames[l].SetHidden( !bShowNames );
+			if( bShowNames )
+			{
+				m_textNames[l].Reset();
+				m_textNames[l].SetXY( NAME_X(l), NAME_Y(l) );
+				m_textNames[l].SetDiffuse( STEPS_TYPE_COLOR(pts.colorIndex) );
+				ON_COMMAND( m_textNames[l] );
+			}
+
+			m_textScores[l].SetHidden( !bShowScores );
+			if( bShowScores )
+			{
+				m_textScores[l].Reset();
+				m_textScores[l].SetXY( SCORE_X(l), SCORE_Y(l) );
+				m_textScores[l].SetDiffuse( STEPS_TYPE_COLOR(pts.colorIndex) );
+				ON_COMMAND( m_textScores[l] );
+			}
+			
+			m_textPoints[l].SetHidden( !bShowPoints );
+			if( bShowPoints )
+			{
+				m_textPoints[l].Reset();
+				m_textPoints[l].SetXY( POINTS_X(l), POINTS_Y(l) );
+				m_textPoints[l].SetDiffuse( STEPS_TYPE_COLOR(pts.colorIndex) );
+				ON_COMMAND( m_textPoints[l] );
+			}
+			
+			m_textTime[l].SetHidden( !bShowTime );
+			if( bShowTime )
+			{
+				m_textTime[l].Reset();
+				m_textTime[l].SetXY( TIME_X(l), TIME_Y(l) );
+				m_textTime[l].SetDiffuse( STEPS_TYPE_COLOR(pts.colorIndex) );
+				ON_COMMAND( m_textTime[l] );
 			}
 		}
 	}
 
+	{
+		const unsigned num_songs = SONGMAN->GetAllSongs().size();
+		for( vector<Difficulty>::iterator dc_iter=m_vDiffsToShow.begin(); dc_iter!=m_vDiffsToShow.end(); dc_iter++ )
+		{
+			m_sprDifficulty[*dc_iter].SetHidden( !bShowDifficulty );
+			if( bShowDifficulty )
+			{
+				m_sprDifficulty[*dc_iter].Reset();
+				m_sprDifficulty[*dc_iter].StopAnimating();
+				m_sprDifficulty[*dc_iter].SetState( *dc_iter );
+				m_sprDifficulty[*dc_iter].SetXY( DIFFICULTY_X(*dc_iter), DIFFICULTY_Y );
+				ON_COMMAND( m_sprDifficulty[*dc_iter] );
+			}
+		}
 
+		m_ListScoreRowItems.SetHidden( !bShowStepsScore );
+		if( bShowStepsScore )
+		{
+			m_ListScoreRowItems.Reset();
+			SET_XY_AND_ON_COMMAND( m_ListScoreRowItems );
+
+			vector<Actor*> vpActors;
+			for( int i=0; i<m_vpStepsScoreRowItem.size(); i++ )
+				vpActors.push_back( m_vpStepsScoreRowItem[i] );
+			m_ListScoreRowItems.Load( vpActors, NUM_ROW_ITEMS_TO_SHOW, SCREEN_WIDTH, ROW_SPACING_Y, false, 1, 0, false );
+
+			for( int s=0; s<num_songs; s++ )
+			{
+				StepsScoreRowItem *pStepsScoreRowItems = m_vpStepsScoreRowItem[s];
+				pStepsScoreRowItems->m_sprSongFrame.Reset();
+				pStepsScoreRowItems->m_sprSongFrame.SetXY( SONG_FRAME_OFFSET_X, SONG_FRAME_OFFSET_Y );
+				pStepsScoreRowItems->m_sprSongFrame.SetUseZBuffer( true );
+				ON_COMMAND( pStepsScoreRowItems->m_sprSongFrame );
+
+				pStepsScoreRowItems->m_textSongTitle.Reset();
+				pStepsScoreRowItems->m_textSongTitle.SetXY( SONG_TITLE_OFFSET_X, SONG_TITLE_OFFSET_Y );
+				pStepsScoreRowItems->m_textSongTitle.SetUseZBuffer( true );
+				ON_COMMAND( pStepsScoreRowItems->m_textSongTitle );
+
+				for( vector<Difficulty>::iterator dc_iter=m_vDiffsToShow.begin(); dc_iter!=m_vDiffsToShow.end(); dc_iter++ )
+				{
+					pStepsScoreRowItems->m_textStepsScore[*dc_iter].Reset();
+					pStepsScoreRowItems->m_textStepsScore[*dc_iter].SetXY( STEPS_SCORE_OFFSET_X(*dc_iter), STEPS_SCORE_OFFSET_Y );
+					pStepsScoreRowItems->m_textStepsScore[*dc_iter].SetUseZBuffer( true );
+					pStepsScoreRowItems->m_textStepsScore[*dc_iter].SetDiffuse( STEPS_TYPE_COLOR(pts.colorIndex) );
+					ON_COMMAND( pStepsScoreRowItems->m_textStepsScore[*dc_iter] );
+				}
+			}
+		}
+	}
+
+	// get ranking feat list
+	
+
+	//
 	// init page
+	//
 	switch( pts.type )
 	{
 	case PageToShow::TYPE_CATEGORY:
 		{
-			m_sprCategory.Load( THEME->GetPathToG(ssprintf("ScreenRanking category %c", 'A'+pts.category)) );
-			m_sprType.Load( THEME->GetPathToG("ScreenRanking type "+GameManager::NotesTypeToString(pts.nt)) );
+			m_textCategory.SetText( ssprintf("Type %c", 'A'+pts.category) );
+			m_textStepsType.SetText( GameManager::NotesTypeToString(pts.nt) );
 
 			for( int l=0; l<NUM_RANKING_LINES; l++ )
 			{
 				ProfileManager::CategoryData::HighScore hs;
+				bool bRecentHighScore = false;
 				if( l < (int)PROFILEMAN->m_CategoryDatas[MEMORY_CARD_MACHINE][pts.nt][pts.category].vHighScores.size() )
+				{
 					hs = PROFILEMAN->m_CategoryDatas[MEMORY_CARD_MACHINE][pts.nt][pts.category].vHighScores[l];
+					CString *psName = &PROFILEMAN->m_CategoryDatas[MEMORY_CARD_MACHINE][pts.nt][pts.category].vHighScores[l].sName;
+					bRecentHighScore = find( GAMESTATE->m_vpsNamesThatWereFilled.begin(), GAMESTATE->m_vpsNamesThatWereFilled.end(), psName ) != GAMESTATE->m_vpsNamesThatWereFilled.end();
+				}
 				else
-					hs.sName = NO_SCORE_NAME;
+				{
+					hs.sName = NO_SCORE_NAME;				
+				}
 				if( hs.sName.empty() )
 					hs.sName = EMPTY_SCORE_NAME;
 
 				m_textNames[l].SetText( hs.sName );
 				m_textScores[l].SetText( ssprintf("%09i",hs.iScore) );
-				m_textNames[l].SetDiffuse( TEXT_COLOR(pts.colorIndex) );
-				m_textScores[l].SetDiffuse( TEXT_COLOR(pts.colorIndex) );
-
-				bool bRecentHighScore = false;
-				// FIXME
-//				for( int p=0; p<NUM_PLAYERS; p++ )
-//				{
-//					bRecentHighScore |=
-//						pts.nt == GAMESTATE->m_RankingNotesType  &&
-//						GAMESTATE->m_RankingCategory[p] == pts.category  &&
-//						GAMESTATE->m_iRankingIndex[p] == l;
-//				}
+				m_textNames[l].SetDiffuse( STEPS_TYPE_COLOR(pts.colorIndex) );
+				m_textScores[l].SetDiffuse( STEPS_TYPE_COLOR(pts.colorIndex) );
 
 				if( bRecentHighScore )
 				{
@@ -462,30 +549,26 @@ void ScreenRanking::SetPage( PageToShow pts )
 				}
 			}
 		}
-		break;
+		return SECONDS_PER_PAGE;
 	case PageToShow::TYPE_COURSE:
 		{
-			m_textCategory.SetDiffuseAlpha(0);
-			m_sprCategory.SetDiffuseAlpha(0);
-			CString path = THEME->GetPathToG("ScreenRanking category "+pts.pCourse->m_sName, true);
-			if( IsAFile(path) )
-			{
-				m_sprCategory.Load( path );
-				m_sprCategory.SetDiffuseAlpha(1);
-			} else {
-				m_textCategory.SetMaxWidth( CATEGORY_WIDTH );
-				m_textCategory.SetText( pts.pCourse->m_sName );
-				m_textCategory.SetDiffuseAlpha(1);
-			}
+			m_Banner.LoadFromCourse( pts.pCourse );
+			m_textStepsType.SetText( GameManager::NotesTypeToString(pts.nt) );
 
-			m_sprType.Load( THEME->GetPathToG("ScreenRanking type "+GameManager::NotesTypeToString(pts.nt)) );
 			for( int l=0; l<NUM_RANKING_LINES; l++ )
 			{
 				Course::MemCardData::HighScore hs;
+				bool bRecentHighScore = false;
 				if( l < (int)pts.pCourse->m_MemCardDatas[pts.nt][MEMORY_CARD_MACHINE].vHighScores.size() )
+				{
 					hs = pts.pCourse->m_MemCardDatas[pts.nt][MEMORY_CARD_MACHINE].vHighScores[l];
+					CString *psName = &pts.pCourse->m_MemCardDatas[pts.nt][MEMORY_CARD_MACHINE].vHighScores[l].sName;
+					bRecentHighScore = find( GAMESTATE->m_vpsNamesThatWereFilled.begin(), GAMESTATE->m_vpsNamesThatWereFilled.end(), psName ) != GAMESTATE->m_vpsNamesThatWereFilled.end();
+				}
 				else
-					hs.sName = NO_SCORE_NAME;
+				{
+					hs.sName = NO_SCORE_NAME;				
+				}
 				if( hs.sName.empty() )
 					hs.sName = EMPTY_SCORE_NAME;
 				
@@ -500,114 +583,100 @@ void ScreenRanking::SetPage( PageToShow pts )
 					m_textTime[l].SetText( "" );
 					m_textScores[l].SetText( ssprintf("%09d",hs.iScore) );
 				}
-				m_textNames[l].SetDiffuse( TEXT_COLOR(pts.colorIndex) );
-				m_textPoints[l].SetDiffuse( TEXT_COLOR(pts.colorIndex) );
-				m_textTime[l].SetDiffuse( TEXT_COLOR(pts.colorIndex) );
-				m_textScores[l].SetDiffuse( TEXT_COLOR(pts.colorIndex) );
-				for( int p=0; p<NUM_PLAYERS; p++ )
+				m_textNames[l].SetDiffuse( STEPS_TYPE_COLOR(pts.colorIndex) );
+				m_textPoints[l].SetDiffuse( STEPS_TYPE_COLOR(pts.colorIndex) );
+				m_textTime[l].SetDiffuse( STEPS_TYPE_COLOR(pts.colorIndex) );
+				m_textScores[l].SetDiffuse( STEPS_TYPE_COLOR(pts.colorIndex) );
+
+				if( bRecentHighScore )
 				{
-					bool bHighlight = false;
-					// FIXME
-//					bHighlight = pts.pCourse == GAMESTATE->m_pRankingCourse  &&
-//						pts.nt == GAMESTATE->m_RankingNotesType  &&
-//						GAMESTATE->m_iRankingIndex[p] == l;
-					if( bHighlight )
-					{
-						m_textNames[l].SetEffectGlowBlink(0.1f);
-						m_textScores[l].SetEffectGlowBlink(0.1f);
-					}
-					else
-					{
-						m_textNames[l].SetEffectNone();
-						m_textScores[l].SetEffectNone();
-					}
+					m_textNames[l].SetEffectGlowBlink(0.1f);
+					m_textScores[l].SetEffectGlowBlink(0.1f);
+				}
+				else
+				{
+					m_textNames[l].SetEffectNone();
+					m_textScores[l].SetEffectNone();
 				}
 			}
 		}
-		break;
-	case PageToShow::TYPE_SONG:
+		return SECONDS_PER_PAGE;
+	case PageToShow::TYPE_ALL_STEPS:
 		{
-			m_textCategory.SetDiffuseAlpha(0);
-			m_sprCategory.SetDiffuseAlpha(0);
+			m_textStepsType.SetText( GameManager::NotesTypeToString(pts.nt) );
 
-			m_banner.LoadFromSong( pts.pSong );
-			m_banner.ScaleToClipped( BANNER_WIDTH, BANNER_HEIGHT );
-			m_banner.SetDiffuseAlpha(1);
-
-			m_sprBannerFrame.Load( THEME->GetPathToG("ScreenRanking banner frame") );
-			m_sprBannerFrame.SetDiffuseAlpha(1);
-
-			m_textCategory.SetMaxWidth( CATEGORY_WIDTH );
-			m_textCategory.SetText( pts.pSong->GetFullTranslitTitle() );
-			m_textCategory.SetDiffuseAlpha(1);
-		
-			m_sprType.SetDiffuse( RageColor(1,1,1,1) );
-			m_sprType.Load( THEME->GetPathToG("ScreenRanking type "+GameManager::NotesTypeToString(pts.nt)) );
-
-			for( DiffVectorCIter dIter = m_vDiffsToShow.begin(); dIter != m_vDiffsToShow.end(); dIter++ )
+			const unsigned num_songs = SONGMAN->GetAllSongs().size();
+			for( int s=0; s<num_songs; s++ )
 			{
-				int d = (int)*dIter;
+				Song* pSong = SONGMAN->GetAllSongs()[s];
+				StepsScoreRowItem *pStepsScoreRowItem = m_vpStepsScoreRowItem[s];
 
-				Difficulty dc = (Difficulty)d;
-				Steps* pSteps = pts.pSong->GetStepsByDifficulty( pts.nt, dc );
+				pStepsScoreRowItem->m_textSongTitle.SetText( pSong->GetFullDisplayTitle() );
 
-									
-				if( pSteps == NULL )
-					m_sprDiffHeaders[d].SetHidden( true );
-				else
-					m_sprDiffHeaders[d].SetDiffuse( RageColor(1,1,1,1) );	
+				for( vector<Difficulty>::iterator dc_iter = m_vDiffsToShow.begin(); dc_iter != m_vDiffsToShow.end(); dc_iter++ )
+				{							
+					Steps* pSteps = pSong->GetStepsByDifficulty( pts.nt, *dc_iter, false );
+					BitmapText* pTextStepsScore = &pStepsScoreRowItem->m_textStepsScore[*dc_iter];
 
-				for( int l=0; l<NUM_RANKING_LINES; l++ )
-				{
 					if( pSteps == NULL )
 					{
-						m_textPercent[l][d].SetHidden( true );
+						pTextStepsScore->SetHidden( true );
 					}
 					else
 					{
 						Steps::MemCardData::HighScore hs;
-						if( l < (int)pSteps->m_MemCardDatas[MEMORY_CARD_MACHINE].vHighScores.size() )
-							hs = pSteps->m_MemCardDatas[MEMORY_CARD_MACHINE].vHighScores[l];
+						bool bRecentHighScore = false;
+						if( !pSteps->m_MemCardDatas[MEMORY_CARD_MACHINE].vHighScores.empty() )
+						{
+							hs = pSteps->m_MemCardDatas[MEMORY_CARD_MACHINE].vHighScores[0];
+							CString *psName = &pSteps->m_MemCardDatas[MEMORY_CARD_MACHINE].vHighScores[0].sName;
+							bRecentHighScore = find( GAMESTATE->m_vpsNamesThatWereFilled.begin(), GAMESTATE->m_vpsNamesThatWereFilled.end(), psName ) != GAMESTATE->m_vpsNamesThatWereFilled.end();
+						}
 						else
-							hs.sName = NO_SCORE_NAME;
+						{
+							hs.sName = NO_SCORE_NAME;				
+						}
 						if( hs.sName.empty() )
 							hs.sName = EMPTY_SCORE_NAME;
 
 						CString s;
 						s = hs.sName + "\n";
 						s += ssprintf( "%0*.*f%%", PERCENT_TOTAL_SIZE, PERCENT_DECIMAL_PLACES, hs.fPercentDP*100 );
-						m_textPercent[l][d].SetText( s );
-						m_textPercent[l][d].SetDiffuse( TEXT_COLOR(pts.colorIndex) );
+						pTextStepsScore->SetText( s );
 					}
 				}
 			}
 		}
-		break;
+		return m_ListScoreRowItems.GetSecondsForCompleteScrollThrough();
 	default:
 		ASSERT(0);
+		return 0;
 	}
 }
 
 void ScreenRanking::TweenPageOffScreen()
 {
-	int l, d;
-
-	OFF_COMMAND( m_sprCategory );
-	OFF_COMMAND( m_banner );
+	OFF_COMMAND( m_Banner );
 	OFF_COMMAND( m_sprBannerFrame );
-	OFF_COMMAND( m_sprType );
 	OFF_COMMAND( m_textCategory );
+	OFF_COMMAND( m_textStepsType );
 
-	for( l=0; l<NUM_RANKING_LINES; l++ )
+	for( int l=0; l<NUM_RANKING_LINES; l++ )
 	{
-		m_sprBullets[l].Command( BULLETS_OFF_COMMAND(l) );
-		m_textNames[l].Command( NAMES_OFF_COMMAND(l) );
-		m_textScores[l].Command( SCORES_OFF_COMMAND(l) );
-		m_textPoints[l].Command( POINTS_OFF_COMMAND(l) );
-		m_textTime[l].Command( TIME_OFF_COMMAND(l) );
-		for( d=0; d<NUM_DIFFICULTIES; d++ )
-			m_textPercent[l][d].Command( PERCENT_OFF_COMMAND(l) );
+		OFF_COMMAND( m_sprBullets[l] );
+		OFF_COMMAND( m_textNames[l] );
+		OFF_COMMAND( m_textScores[l] );
+		OFF_COMMAND( m_textPoints[l] );
+		OFF_COMMAND( m_textTime[l] );
 	}
-	for( d=0; d<NUM_DIFFICULTIES; d++ )
-		m_sprDiffHeaders[d].Command( DIFFICULTY_OFF_COMMAND );
+	const unsigned num_songs = SONGMAN->GetAllSongs().size();
+	for( vector<Difficulty>::iterator dc_iter=m_vDiffsToShow.begin(); dc_iter!=m_vDiffsToShow.end(); dc_iter++ )
+	{
+		OFF_COMMAND( m_sprDifficulty[*dc_iter] );
+		for( int s=0; s<num_songs; s++ )
+		{
+			// m_vpTextStepsScore[*dc_iter][s];			
+		}
+	}
+	OFF_COMMAND( m_ListScoreRowItems );
 }
diff --git a/stepmania/src/ScreenRanking.h b/stepmania/src/ScreenRanking.h
index 72002a0bf7..9a34c95feb 100644
--- a/stepmania/src/ScreenRanking.h
+++ b/stepmania/src/ScreenRanking.h
@@ -6,6 +6,7 @@
 
  Copyright (c) 2001-2002 by the person(s) listed below.  All rights reserved.
 	Chris Danford
+	Ben Nordstrom
 -----------------------------------------------------------------------------
 */
 
@@ -15,6 +16,7 @@
 #include "Sprite.h"
 #include "BitmapText.h"
 #include "Banner.h"
+#include "ListDisplay.h"
 
 class Course;
 class Song;
@@ -23,45 +25,48 @@ class ScreenRanking : public ScreenAttract
 {
 public:
 	ScreenRanking( CString sName );
+	~ScreenRanking();
 
 	void HandleScreenMessage( const ScreenMessage SM );
 
 protected:
 	struct PageToShow
 	{
-		enum { TYPE_CATEGORY, TYPE_COURSE, TYPE_SONG } type;
+		enum { TYPE_CATEGORY, TYPE_COURSE, TYPE_ALL_STEPS } type;
 		int				colorIndex;
-		StepsType		nt;		// used in category and course
+		StepsType		nt;
 		RankingCategory	category;
 		Course*			pCourse;
-		Song*			pSong;
-		PageToShow(): pCourse(NULL), pSong(NULL) { }
+		PageToShow(): pCourse(NULL) { }
 	};
 
-	void SetPage( PageToShow pts );
+	float SetPage( PageToShow pts );
 	void TweenPageOnScreen();
 	void TweenPageOffScreen();
 
 
-	Sprite m_sprCategory;
-	Banner m_banner;
-	Sprite m_sprBannerFrame;
-	BitmapText m_textCategory;
-	Sprite m_sprType;
-	Sprite m_sprBullets[NUM_RANKING_LINES];
-	Sprite m_sprDiffHeaders[NUM_DIFFICULTIES];
-	BitmapText m_textNames[NUM_RANKING_LINES];
-	BitmapText m_textScores[NUM_RANKING_LINES];	// for category
+	Banner m_Banner;	// for course
+	Sprite m_sprBannerFrame;	// for course
+	BitmapText m_textCategory;	// for category
+	BitmapText m_textStepsType;	// for category, course, all_steps
+
+	Sprite	   m_sprBullets[NUM_RANKING_LINES];	// for category and course
+	BitmapText m_textNames[NUM_RANKING_LINES];	// for category and course
+	BitmapText m_textScores[NUM_RANKING_LINES];	// for category and course
 	BitmapText m_textPoints[NUM_RANKING_LINES];	// for course
 	BitmapText m_textTime[NUM_RANKING_LINES];	// for course
-	BitmapText m_textPercent[NUM_RANKING_LINES][NUM_DIFFICULTIES];	// for song
+	Sprite m_sprDifficulty[NUM_DIFFICULTIES];	// for all_steps
+	struct StepsScoreRowItem : public ActorFrame	// for all_steps
+	{
+		Sprite	m_sprSongFrame;
+		BitmapText	m_textSongTitle;
+		BitmapText m_textStepsScore[NUM_DIFFICULTIES];
+	};
+	vector<StepsScoreRowItem*> m_vpStepsScoreRowItem;	// for all_steps
+	ListDisplay m_ListScoreRowItems;
 
 	vector<PageToShow>	m_vPagesToShow;
-
 	vector<Difficulty>  m_vDiffsToShow;
-
-	typedef vector<Difficulty>::iterator		DiffVectorIter;
-	typedef vector<Difficulty>::const_iterator	DiffVectorCIter;
 };
 
 
diff --git a/stepmania/src/StepMania.dsp b/stepmania/src/StepMania.dsp
index 46c9ee14ca..9e4da1f541 100644
--- a/stepmania/src/StepMania.dsp
+++ b/stepmania/src/StepMania.dsp
@@ -65,7 +65,7 @@ IntDir=.\../Debug6
 TargetDir=\stepmania\stepmania\Program
 TargetName=StepMania-debug
 SOURCE="$(InputPath)"
-PreLink_Cmds=disasm\verinc                         	cl                         /Zl                         /nologo                         /c                         verstub.cpp                         /Fo$(IntDir)\ 
+PreLink_Cmds=disasm\verinc                             	cl                             /Zl                             /nologo                             /c                             verstub.cpp                             /Fo$(IntDir)\ 
 PostBuild_Cmds=disasm\mapconv $(IntDir)\$(TargetName).map $(TargetDir)\StepMania.vdi
 # End Special Build Tool
 
@@ -102,8 +102,8 @@ IntDir=.\Debug
 TargetDir=\stepmania\stepmania
 TargetName=default
 SOURCE="$(InputPath)"
-PreLink_Cmds=disasm\verinc                                                                                                                                                                                                                                      	cl                                                                                                                                                                                                                                       /Zl                                                                                                                                                                                                                                       /nologo                                                                                                                                                                                                                                       /c \
-                                                                                                                                                                                                                                      verstub.cpp                                                                                                                                                                                                                                                                               /Fo$(IntDir)\ 
+PreLink_Cmds=disasm\verinc                                                                                                                                                                                                                                          	cl                                                                                                                                                                                                                                           /Zl                                                                                                                                                                                                                                           /nologo                                                                                                                                                                                                                                           /c \
+                                                                                                                                                                                                                                              verstub.cpp                                                                                                                                                                                                                                                                                   /Fo$(IntDir)\ 
 PostBuild_Cmds=disasm\mapconv $(IntDir)\$(TargetName).map $(TargetDir)\StepMania.vdi ia32.vdi
 # End Special Build Tool
 
@@ -143,7 +143,7 @@ IntDir=.\../Release6
 TargetDir=\stepmania\stepmania\Program
 TargetName=StepMania
 SOURCE="$(InputPath)"
-PreLink_Cmds=disasm\verinc                          	cl                           /Zl                           /nologo                           /c                           verstub.cpp                           /Fo$(IntDir)\ 
+PreLink_Cmds=disasm\verinc                              	cl                               /Zl                               /nologo                               /c                               verstub.cpp                               /Fo$(IntDir)\ 
 PostBuild_Cmds=disasm\mapconv $(IntDir)\$(TargetName).map $(TargetDir)\StepMania.vdi
 # End Special Build Tool
 
@@ -184,8 +184,8 @@ IntDir=.\StepMania___Xbox_Release
 TargetDir=\stepmania\stepmania
 TargetName=default
 SOURCE="$(InputPath)"
-PreLink_Cmds=disasm\verinc                                                                                                                                                                                                                                       	cl                                                                                                                                                                                                                                        /Zl                                                                                                                                                                                                                                        /nologo                                                                                                                                                                                                                                        /c \
-                                                                                                                                                                                                                                        verstub.cpp                                                                                                                                                                                                                                                                                /Fo$(IntDir)\ 
+PreLink_Cmds=disasm\verinc                                                                                                                                                                                                                                           	cl                                                                                                                                                                                                                                            /Zl                                                                                                                                                                                                                                            /nologo                                                                                                                                                                                                                                            /c \
+                                                                                                                                                                                                                                                verstub.cpp                                                                                                                                                                                                                                                                                    /Fo$(IntDir)\ 
 PostBuild_Cmds=disasm\mapconv $(IntDir)\$(TargetName).map $(TargetDir)\StepMania.vdi ia32.vdi
 # End Special Build Tool
 
@@ -4007,6 +4007,25 @@ SOURCE=.\JukeboxMenu.h
 # End Source File
 # Begin Source File
 
+SOURCE=.\ListDisplay.cpp
+
+!IF  "$(CFG)" == "StepMania - Win32 Debug"
+
+!ELSEIF  "$(CFG)" == "StepMania - Xbox Debug"
+
+!ELSEIF  "$(CFG)" == "StepMania - Win32 Release"
+
+!ELSEIF  "$(CFG)" == "StepMania - Xbox Release"
+
+!ENDIF 
+
+# End Source File
+# Begin Source File
+
+SOURCE=.\ListDisplay.h
+# End Source File
+# Begin Source File
+
 SOURCE=.\MemoryCardDisplay.cpp
 
 !IF  "$(CFG)" == "StepMania - Win32 Debug"