From c7e5edab5ec328b24db66e4d02a126ed24224056 Mon Sep 17 00:00:00 2001
From: AJ Kelly <aj187@ajworld.net>
Date: Tue, 2 Jun 2009 01:21:14 +0000
Subject: [PATCH] course mode fixes on SelectMusic

---
 .../_CourseEntryDisplay bar.lua               |  10 +++
 .../_CourseEntryDisplay bar.png               | Bin 3071 -> 0 bytes
 .../ScreenSelectMusic decorations/default.lua |  80 ++++++++++--------
 3 files changed, 54 insertions(+), 36 deletions(-)
 create mode 100644 stepmania/Themes/default/BGAnimations/ScreenSelectMusic decorations/_CourseEntryDisplay bar.lua
 delete mode 100644 stepmania/Themes/default/BGAnimations/ScreenSelectMusic decorations/_CourseEntryDisplay bar.png

diff --git a/stepmania/Themes/default/BGAnimations/ScreenSelectMusic decorations/_CourseEntryDisplay bar.lua b/stepmania/Themes/default/BGAnimations/ScreenSelectMusic decorations/_CourseEntryDisplay bar.lua
new file mode 100644
index 0000000000..3959083885
--- /dev/null
+++ b/stepmania/Themes/default/BGAnimations/ScreenSelectMusic decorations/_CourseEntryDisplay bar.lua	
@@ -0,0 +1,10 @@
+return Def.ActorFrame {
+	Def.Quad {
+		Name="ItemBase";
+		InitCommand=cmd(zoomto,270,32;diffuse,color("0,0,0,0.5"););
+	};
+	Def.Quad {
+		Name="ItemBottomBorder";
+		InitCommand=cmd(y,16;zoomto,270,2;diffuse,color("1,1,1,0.5"););
+	};
+};
\ No newline at end of file
diff --git a/stepmania/Themes/default/BGAnimations/ScreenSelectMusic decorations/_CourseEntryDisplay bar.png b/stepmania/Themes/default/BGAnimations/ScreenSelectMusic decorations/_CourseEntryDisplay bar.png
deleted file mode 100644
index ffe610268ceae2864094dc273293463f802828df..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 3071
zcmV<b3jp+qP)<h;3K|Lk000e1NJLTq009mF001lq0ssI28^FPP00004XF*Lt006JZ
zHwB960000PbVXQnQ*UN;cVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBU-kx4{BRCwC#
zU0ci@RT*7-?lb4|UwZkaSZWI?QlTai2?Egv6O9tDghUbzi9}zBNll0tHTr-)VB&*B
zP#z>c5F$|!f+j|M!4QZb1k_rg0&Qu_fB(;Y?lXRCpYyk<@xd3vguOC3-Tyf==V6~&
zUElh?Z|_lf@FYAR%7Ri5)HMtY3<T#GQCG-P2dh1_=HR#B`mh}{KL!TpQ5MKkqzT4-
z2WkY{Md+gyUA5@F(>K#&U_hKs@yuq8ae-nYG;z?2kvYhH6yd=g-X*Rwb7Wv3h_d>b
zevZKegCQod1HXiwz#2jM_b=D5EHg(221HdsjY$n5h+jGwSBO(&6QmyeivHffz<`Fn
zLORB1LV{G4gHV*DMx>8Gk7wRr@l}{(>0>%jYW9)-CY>CpNj~|~s+tX$L#s_D&7k?J
zQp2wK3cflR7O*N5Im#SK2HWOIQ+hZy<S$nS4v#FsnU`_=1yvP77*&<H=-u`H!*$qY
zqM#^{S14-~<%~8ksb_<R2ViNAagI3GsuBq?z}Gh5D{?~wL<nOEJzO4gyFYw4o_idd
zE9lIlvslk9B5K!pfum2Mw+6>^FS(+)>GnDbNjW)$OQqJYT9J_k292bO=!709jvWj#
zST-_!iw8MND~^Jv5IC%~Jo;lidN=Y6OZ#xm_1JqUx{G9ykU=P*O2n~HC|^E_J3j9n
zzBc>xS1Bw>iELY5Y7>kZG}o(SRFy>j_ZM3qDOd_E3vCObt(C-s=S!4Tf9F%!TEnjW
zxbOfDUitAIw(@F}t3{GBMspm?b*--bShk2=x$rIf%hP!7_trP=ujX3FEEI}?+0?)o
z7&MP63a&QiLXb-Sx$Oa}O4LPr5$z6w5K-hLz2b+r;-X72w*=37-#fa`Z;I@sR36bE
ziLT^gVU);=>%ebawIh0_7vmp)#qsAc*s{O&({lI4m`sqS$i)SfMpz7*sVXrheIz4M
z6@_pAoKz7L(%r!hm#}3iySn2h>_3EE7o*eWr|AUo0I`VC76Ug|?7qhuzrrjh=C`ot
z66`yKm;Q)ne~Z`tW_|ZpmFFXg*%v@<Db36qG?FUgJ|-g_fb|n78+8G@f+sPUSKWCt
z%9Ntf6_M%Cmc(OTGu)&z5#L`0uuJ&b??`-QTc|Re_&bx(?Ri{&9sIER{ulAh2azdE
zN(OvcW@g@?nW~Z?Nl*(_+BWmT3qIyUbR+8z4^*d)Vc&bOV>kRj=ZH%rV{EQr)RzlL
z3}HxMF|}nod`E&YKjL_>4%frdUO2vlVb()GsBSz0w?JAUE6mIrGz^tOYQeEsFJT63
zYeK4oC0a_Ab@j+kBnHFM9*BI@nib+qCPR!iP*kk6i0}6Ts*Uf`_h{$Bd~*;n66<fm
zy8wIk<M4IWlaFC*1Mo1+F&LSdH)xuw)W~9nRLMlwRoV{S$XrVf>+zqJ$q;)Fv6$G~
zM9@aAtNQ&_Rv3jOa;6AKXAXXwVv;4S$w=@f#@*Gavs(8phaDU^jF+FsgLmSV@4?EU
zCT8Xh8W?~Tv+5$fil~aRup}Qi<r5EK@dEk{&t->8o*^D#xQg+BG@y9cbnte_z)S>3
z%)OOTZE9VX5rzZ-d=VTU&H`Qj6ThI&6c*NoX66l=M->qRs>)c#4mu8PeJ8ZbNjcoY
zfy)tzVtDY{^dU(fBYl@o%kD0V`FwxcAtr<=MM+Zj$uJ!(?*s@#@=C1Bt_!I!>nCy1
zWtg~T<_((WRcab_376!ct=}9`RkGT7^{G-^iUeI^+$FdYD`OS9iel5E6gu0hT&SA)
zt}3M6v0S}y(xM94x|x!lW8N%-9CcW$dEp5x?88dm%)CMKyh@%huu5mD;xVjh`Q;n0
z!3#N7(?cwKO)(J@pGV00B!e43Idt>FrRh0#z&;t_lI!U9O5HpruN7E$5wE{?233rO
zz|6cs0|T%cUWTO5US&h8N>bE=4YGos#G+Zp)U}JGfGJ?@Y$zI?d2MtYGC>B&;8gt6
zpCggvO))UjMKAIy7iKZWV=VW~%o{XMRfGcRh}9LU%ACHleTRK3?7gqa6Gl)vwKX*)
z5}1h-8TZJdP?u07^zuYrY_wgP7`e)0=NR0G1JR$dhVIqZMg59(8v}#4ER^~$Q~~0G
z?Z2eT+K|!IIJW$DDeOrSZ8j{PCn1*H^tFz)Y743Oje;DAf|+8-*zxt5LJ6OqKA3L%
z;?U2eDT)kXn**aN22BjWxLwPbkr9`6&Ff9ToZ4Et5YOobmZ(J?sH+)a#DNIqM0323
z=8S}4fsV>THsOo8r)jYmy!k$@3+)O>m3YABnFEK}3$rsaGjGs9uVN#vkknIE>GMY4
z>XnyWi%0H7GDOy<Es=<;n64kTc=#cmdYzLP(}rS+!Ca+RO<LNwSbX2ouX1KQ!qze-
z101{(lN_hl&CDA#Cmx$|Wm{F!saFYjf7@lTup8Y440}xSMsx5}*5D<Y^7TSUucb?k
zI&qAt(f3e?uyul1zS`26G};*Ot9$EMIYp@vF16d(8JhVwXqaiCS8*sQsnU%t>phZa
z=NiIA`{4V_XMacI-d>=#$YrH2$txXGxjDTG1*9ZT#F@B(P6OxwOlh77F+_*rA(l^I
z`4m@84tkhWIJ;qf1%u`VU}eq~C|Sa07R*K3tCT1w^$lOa)4#^bX|xs?afKaf2(`jx
z#MM!}Ot`@<TV0kNTM@-XY>Cp1WUfo9Bq>%-;^Z+5HgLnOx`DF7qVXyQ4U!Z!ql#Gc
zL~eUq2Vm<PI-PY^RHL#Z`=ehdAHE06uj*bepZP1cv3R=U%Vkl8{0V0L#ZH?#!xH{>
z;WEv!_BxKgNU9vV8tcojBAh*o%~kV57&MG95`c-SWbw9FnQv*=E)i6LY*>EeW<2#9
zY%HUFhRtA|E-i{x(&GC8!hpSDe#A1oa7h%VtY-aSbwNGZT*J$M!YeOQd9M60hFe?&
z7TQ>Bo1ehoE$iR^<FBczfYpw~relFnWn+s}Nh{V_(h_-Pef_@bTc5$Ghrt@!U3fx_
z7MmcwkYnM1Cq_jVB878hL0g~ah$rZ+;MJq#NpBT59>E(Y;Iy#yhVG(C%+F%b81kIs
zOrcdJ&oos!EtVhykDGu&IMlC_mV4X1`CUh_dYYn<7kbBv3SF0rgjGFjBdarAZ_(Cg
zG{EZXIDHJSALqK_kKKZ`)0p4Mg_D7$13B|J3WKJEUfXPu`&_7!iV`@eYK0Gej%T<5
zyI0r?JdcH4SlVkvt?EZdxc+PB9xS~JodxXHOIgIFh>5qgwunT@31ZxZ7|X9={S1}o
zlV2unYMVTfBaOK%%<OMu&?H+w9oKr#RNZt^*ADlZkT)f)3Z_pZl8<8vy(-(n?f0o)
z-c=ucl6QQoi*;Ri;j$E4ms1?lE*{d5^wvp<E3U<RKZKPNEX$1h+}|~Dx%*yacw+FD
z_bTem0ob-znc8|`3!Ch(`K<1V^w`bi=`D-IzKfynE@FN+b}X^l_~<=2^%C13{gBxJ
zfv5AuRmpFW)Ak&|)z?#7#FI$OHrV8He2#O&6N4r(NBt{>L{*COs?ybsUb=bSarE*m
zaC4(^k7?q3!qDsbFVVZFW4!Wbu9z3L*}C9(;0hKQg)kyJ%O__>e>_By(9(D|_q;GL
zXi(fWW6QR-2vtf41y?I7eBcxMkt^yvrKZn^;C8G5lfq(PB>IZFtg(2y3ue0iU0JY-
z$%o}-TzotpP)TGUVj?W8N~0$Rjpd9w_h6LS6HqMi8=blB$E4`zNbm#9&SLQ;=I&nq
zYxw87+k1!`7&OYasDB$w7yR;Yn7`Uq6P*Y?cjcQnV_@)hqssK(^G`jYS6R@je4X=8
z<f_kUi$2Nh%x&;CioUkJ$~0L#4Y<T*hzU0^FfcGMFfcIq|Kgtl3;@-e1?wMs(rW+!
N002ovPDHLkV1md|*Ma~5

diff --git a/stepmania/Themes/default/BGAnimations/ScreenSelectMusic decorations/default.lua b/stepmania/Themes/default/BGAnimations/ScreenSelectMusic decorations/default.lua
index 9a08183a2f..ac429a8907 100644
--- a/stepmania/Themes/default/BGAnimations/ScreenSelectMusic decorations/default.lua	
+++ b/stepmania/Themes/default/BGAnimations/ScreenSelectMusic decorations/default.lua	
@@ -189,7 +189,7 @@ t[#t+1] = LoadActor( "stop icon" ) .. {
 			local b = false;
 			local song = GAMESTATE:GetCurrentSong();
 			if song then
-				b = song:GetTimingData():HasStops(); 
+				b = song:GetTimingData():HasStops();
 			end;
 			self:visible( b );
 		end;
@@ -199,15 +199,23 @@ t[#t+1] = LoadActor( "stop icon" ) .. {
 	
 t[#t+1] = LoadFont("_venacti Bold 15px") .. {
 	InitCommand=cmd(horizalign,left;x,SCREEN_CENTER_X-14;y,SCREEN_CENTER_Y-24;settext,"xxxx";shadowlengthx,0;shadowlengthy,2;shadowcolor,color("#000000");maxwidth,180);
-	SetCommand=function(self) 
+	SetCommand=function(self)
 			local s = "---";
-			local song = GAMESTATE:GetCurrentSong(); 
+			local song = GAMESTATE:GetCurrentSong();
+			local course = GAMESTATE:GetCurrentCourse();
 			if song then
-				local s2 = song:GetDisplayArtist(); 
-				if s2 ~= "" then 
-					s = "/" .. s2; 
+				local s2 = song:GetDisplayArtist();
+				if s2 ~= "" then
+					s = "/" .. s2;
 				end;
-			end; 
+			end;
+			if course then
+				local trail = GAMESTATE:GetCurrentTrail( GAMESTATE:GetMasterPlayerNumber() );
+				local c2 = join( ", ", trail:GetArtists() );
+				if c2 ~= "" then
+					s = c2;
+				end;
+			end;
 			self:settext( s );
 		end;
 	CurrentSongChangedMessageCommand=cmd(playcommand,"Set");
@@ -218,13 +226,19 @@ t[#t+1] = LoadFont("_venacti Bold 15px") .. {
 	InitCommand=cmd(horizalign,right;x,SCREEN_CENTER_X+224;y,SCREEN_CENTER_Y-6;settext,"xxxx";shadowlengthx,0;shadowlengthy,2;shadowcolor,color("#000000");maxwidth,156);
 	SetCommand=function(self) 
 			local s = "---";
-			local song = GAMESTATE:GetCurrentSong(); 
+			local song = GAMESTATE:GetCurrentSong();
+			local course = GAMESTATE:GetCurrentCourse();
 			if song then
-				local s2 = song:GetGenre(); 
-				if s2 ~= "" then 
-						s = "_" .. s2; 
+				local s2 = song:GetGenre();
+				if s2 ~= "" then
+						s = "_" .. s2;
 				end;
-			end; 
+			end;
+			if course then
+				-- xxx: use localized text
+				local postfix = "Stages";
+				s = course:GetEstimatedNumStages() .. " " .. postfix;
+			end;
 			self:settext( s );
 		end;
 	CurrentSongChangedMessageCommand=cmd(playcommand,"Set");
@@ -242,11 +256,25 @@ t[#t+1] = Def.ActorFrame {
 	CurrentCourseChangedMessageCommand=cmd(playcommand,"Set");
 };
 
+t[#t+1] = Def.Quad{
+	Name="CourseContentsListMaskTop";
+	InitCommand=cmd(x,SCREEN_CENTER_X+176;y,SCREEN_CENTER_Y-56;setsize,SCREEN_WIDTH/2,128;clearzbuffer,true;zwrite,true;blend,'BlendMode_NoEffect');
+	ShowCommand=cmd(bouncebegin,0.3;zoomy,1);
+	HideCommand=cmd(linear,0.3;zoomy,0);
+};
+
+t[#t+1] = Def.Quad{
+	Name="CourseContentsListMaskBottom";
+	InitCommand=cmd(x,SCREEN_CENTER_X+176;y,SCREEN_CENTER_Y+172;setsize,SCREEN_WIDTH/2,128;zwrite,true;blend,'BlendMode_NoEffect');
+	ShowCommand=cmd(bouncebegin,0.3;zoomy,1);
+	HideCommand=cmd(linear,0.3;zoomy,0);
+};
+
 t[#t+1] = Def.CourseContentsList {
 	MaxSongs = 5;
 
 	InitCommand=cmd(x,SCREEN_CENTER_X+160;y,SCREEN_CENTER_Y+91);
-	OnCommand=cmd(zoomy,0;bounceend,0.3;zoom,1);
+	OnCommand=cmd(zoomy,0;bounceend,0.3;zoom,1;ztest,true);
 	OffCommand=cmd(zoomy,1;bouncebegin,0.3;zoomy,0);
 	ShowCommand=cmd(bouncebegin,0.3;zoomy,1);
 	HideCommand=cmd(linear,0.3;zoomy,0);
@@ -260,7 +288,7 @@ t[#t+1] = Def.CourseContentsList {
 	CurrentTrailP2ChangedMessageCommand=cmd(playcommand,"Set");
 
 	Display = Def.ActorFrame { 
-		InitCommand=cmd(setsize,270,44);
+		InitCommand=cmd(setsize,270,34);
 
 		LoadActor("_CourseEntryDisplay bar");
 
@@ -292,12 +320,12 @@ t[#t+1] = Def.CourseContentsList {
 		};
 
 		LoadFont("Common","normal") .. {
-			OnCommand=cmd(x,SCREEN_CENTER_X-192;y,SCREEN_CENTER_Y-230;horizalign,right;shadowlength,0);
+			OnCommand=cmd(x,-(SCREEN_CENTER_X*0.2);y,SCREEN_CENTER_Y-230;zoom,0.75;horizalign,right;shadowlength,0);
 			SetSongCommand=function(self, params) self:settext(params.Modifiers); end;
 		};
 
 		LoadFont("CourseEntryDisplay","difficulty") .. {
-			OnCommand=cmd(x,SCREEN_CENTER_X-222;y,-8;shadowlength,0;settext,"1");
+			OnCommand=cmd(x,SCREEN_CENTER_X-254;y,1;shadowlength,0;settext,"1");
 			DifficultyChangedCommand=function(self, params)
 				if params.PlayerNumber ~= GAMESTATE:GetMasterPlayerNumber() then return end
 				self:diffuse( CourseDifficutlyToColor(params.Difficulty) );
@@ -363,26 +391,6 @@ t[#t+1] = Def.ActorFrame{
 	CurrentSongChangedMessageCommand=cmd(playcommand,"Set");
 };
 
-t[#t+1] = LoadFont("common normal") .. {
-	InitCommand=cmd(x,SCREEN_CENTER_X+262;y,SCREEN_CENTER_Y);
-	OnCommand=cmd(shadowlength,0;addx,-SCREEN_WIDTH;bounceend,0.5;addx,SCREEN_WIDTH);
-	OffCommand=cmd(bouncebegin,0.5;addx,-SCREEN_WIDTH);
-
-	SetCommand=function(self)
-		local Course = GAMESTATE:GetCurrentCourse()
-		if not Course then
-			self:visible(false)
-			return
-		end
-
-		self:visible(true)
-		self:settext( Course:GetEstimatedNumStages() );
-	end;
-
-	CurrentCourseChangedMessageCommand=cmd(playcommand,"Set");
-};
-
-
 if not GAMESTATE:IsCourseMode() then
 	t[#t+1] = Def.DifficultyList {
 		Name="DifficultyList";