From 9b176447c3ed8b464b2154824b5dba7ea7a30b26 Mon Sep 17 00:00:00 2001
From: Jonathan Payne <potentj@gmail.com>
Date: Sun, 31 Aug 2014 22:23:11 -0700
Subject: [PATCH 01/24] Fix up HowToPlay graphics

---
 Themes/_fallback/Languages/en.ini             |  3 ++
 .../ScreenEvaluation decorations/default.lua  |  4 +--
 .../_howtoplay feet.lua                       |  6 ++++
 .../_howtoplay jump.lua                       | 18 ++++++++++
 .../_howtoplay miss.lua                       | 18 ++++++++++
 .../_howtoplay tap.lua                        | 18 ++++++++++
 .../ScreenHowToPlay overlay/default.lua       | 34 ++++++++++++++-----
 .../ScreenWithMenuElements Footer.lua         |  7 +++-
 Themes/default/Languages/en.ini               | 10 ++++--
 Themes/default/metrics.ini                    |  7 ++--
 10 files changed, 108 insertions(+), 17 deletions(-)
 create mode 100644 Themes/default/BGAnimations/ScreenHowToPlay overlay/_howtoplay feet.lua
 create mode 100644 Themes/default/BGAnimations/ScreenHowToPlay overlay/_howtoplay jump.lua
 create mode 100644 Themes/default/BGAnimations/ScreenHowToPlay overlay/_howtoplay miss.lua
 create mode 100644 Themes/default/BGAnimations/ScreenHowToPlay overlay/_howtoplay tap.lua

diff --git a/Themes/_fallback/Languages/en.ini b/Themes/_fallback/Languages/en.ini
index f1e4e8f607..03befaa609 100644
--- a/Themes/_fallback/Languages/en.ini
+++ b/Themes/_fallback/Languages/en.ini
@@ -1647,6 +1647,9 @@ Cancel=CANCEL
 HeaderText=High Scores
 HeaderSubText=Who's the top dog?
 
+[ScreenContinue]
+HelpText=&START; Advance Timer
+
 [ScreenRanking]
 
 [ScreenSMOnlineLogin]
diff --git a/Themes/default/BGAnimations/ScreenEvaluation decorations/default.lua b/Themes/default/BGAnimations/ScreenEvaluation decorations/default.lua
index 0a5b77322a..7e27b3437d 100644
--- a/Themes/default/BGAnimations/ScreenEvaluation decorations/default.lua	
+++ b/Themes/default/BGAnimations/ScreenEvaluation decorations/default.lua	
@@ -70,13 +70,13 @@ local t = LoadFallbackB();
 
 t[#t+1] = StandardDecorationFromFileOptional("StageDisplay","StageDisplay");
 
-if ShowStandardDecoration("GraphDisplay") then
+if ShowStandardDecoration("GraphDisplay") and not GAMESTATE:GetPlayMode() == "PlayMode_Rave" then
 	for pn in ivalues(GAMESTATE:GetHumanPlayers()) do
 		t[#t+1] = StandardDecorationFromTable( "GraphDisplay" .. ToEnumShortString(pn), GraphDisplay(pn) );
 	end
 end
 
-if ShowStandardDecoration("ComboGraph") then
+if ShowStandardDecoration("ComboGraph") and not GAMESTATE:GetPlayMode() == "PlayMode_Rave" then
 	for pn in ivalues(GAMESTATE:GetHumanPlayers()) do
 		t[#t+1] = StandardDecorationFromTable( "ComboGraph" .. ToEnumShortString(pn), ComboGraph(pn) );
 	end
diff --git a/Themes/default/BGAnimations/ScreenHowToPlay overlay/_howtoplay feet.lua b/Themes/default/BGAnimations/ScreenHowToPlay overlay/_howtoplay feet.lua
new file mode 100644
index 0000000000..72401b2ba2
--- /dev/null
+++ b/Themes/default/BGAnimations/ScreenHowToPlay overlay/_howtoplay feet.lua	
@@ -0,0 +1,6 @@
+return LoadFont("Common Normal") .. {
+	Text="Your feet will be used to play!";
+	BeginCommand=function(self)
+		self:AddAttribute(5, {Length= 4, Diffuse=Color.Red})
+	end;
+};
diff --git a/Themes/default/BGAnimations/ScreenHowToPlay overlay/_howtoplay jump.lua b/Themes/default/BGAnimations/ScreenHowToPlay overlay/_howtoplay jump.lua
new file mode 100644
index 0000000000..554a0b1e22
--- /dev/null
+++ b/Themes/default/BGAnimations/ScreenHowToPlay overlay/_howtoplay jump.lua	
@@ -0,0 +1,18 @@
+return Def.ActorFrame {
+	LoadActor(THEME:GetPathB("_frame","3x3"),"rounded black",392+8,80);
+	Def.Quad {
+		Name="Underline";
+		InitCommand=cmd(y,-10);
+		OnCommand=cmd(diffuse,color("#ffd400");shadowlength,1;zoomtowidth,192;fadeleft,0.25;faderight,0.25);
+	};
+	LoadFont("Common Bold") .. {
+		Text="Information";
+		InitCommand=cmd(y,-24);
+		OnCommand=cmd(skewx,-0.125;diffuse,color("#ffd400");shadowlength,2;shadowcolor,BoostColor(color("#ffd40077"),0.25))
+	};
+	LoadFont("Common Normal") .. {
+		Text="Step on both panels if two different\narrows appear at the same time!.";
+		InitCommand=cmd(y,18;wrapwidthpixels,480;vertspacing,-12;shadowlength,1);
+		OnCommand=cmd(zoom,0.875);
+	};
+};
diff --git a/Themes/default/BGAnimations/ScreenHowToPlay overlay/_howtoplay miss.lua b/Themes/default/BGAnimations/ScreenHowToPlay overlay/_howtoplay miss.lua
new file mode 100644
index 0000000000..d13cf36766
--- /dev/null
+++ b/Themes/default/BGAnimations/ScreenHowToPlay overlay/_howtoplay miss.lua	
@@ -0,0 +1,18 @@
+return Def.ActorFrame {
+	LoadActor(THEME:GetPathB("_frame","3x3"),"rounded black",392+8,80);
+	Def.Quad {
+		Name="Underline";
+		InitCommand=cmd(y,-10);
+		OnCommand=cmd(diffuse,color("#ffd400");shadowlength,1;zoomtowidth,192;fadeleft,0.25;faderight,0.25);
+	};
+	LoadFont("Common Bold") .. {
+		Text="Information";
+		InitCommand=cmd(y,-24);
+		OnCommand=cmd(skewx,-0.125;diffuse,color("#ffd400");shadowlength,2;shadowcolor,BoostColor(color("#ffd40077"),0.25))
+	};
+	LoadFont("Common Normal") .. {
+		Text="If you misstep repeatedly, your dance\nguage will decrease until the game is\nis over!";
+		InitCommand=cmd(y,18;wrapwidthpixels,480;vertspacing,-12;shadowlength,1);
+		OnCommand=cmd(zoom,0.75);
+	};
+};
diff --git a/Themes/default/BGAnimations/ScreenHowToPlay overlay/_howtoplay tap.lua b/Themes/default/BGAnimations/ScreenHowToPlay overlay/_howtoplay tap.lua
new file mode 100644
index 0000000000..ad31a5d3a3
--- /dev/null
+++ b/Themes/default/BGAnimations/ScreenHowToPlay overlay/_howtoplay tap.lua	
@@ -0,0 +1,18 @@
+return Def.ActorFrame {
+	LoadActor(THEME:GetPathB("_frame","3x3"),"rounded black",392+8,80);
+	Def.Quad {
+		Name="Underline";
+		InitCommand=cmd(y,-10);
+		OnCommand=cmd(diffuse,color("#ffd400");shadowlength,1;zoomtowidth,192;fadeleft,0.25;faderight,0.25);
+	};
+	LoadFont("Common Bold") .. {
+		Text="Information";
+		InitCommand=cmd(y,-24);
+		OnCommand=cmd(skewx,-0.125;diffuse,color("#ffd400");shadowlength,2;shadowcolor,BoostColor(color("#ffd40077"),0.25))
+	};
+	LoadFont("Common Normal") .. {
+		Text="When the arrows rise to this point,\nstep on the matching panels.";
+		InitCommand=cmd(y,18;wrapwidthpixels,480;vertspacing,-12;shadowlength,1);
+		OnCommand=cmd(zoom,0.875);
+	};
+};
diff --git a/Themes/default/BGAnimations/ScreenHowToPlay overlay/default.lua b/Themes/default/BGAnimations/ScreenHowToPlay overlay/default.lua
index eecab8257d..7d360c871b 100644
--- a/Themes/default/BGAnimations/ScreenHowToPlay overlay/default.lua	
+++ b/Themes/default/BGAnimations/ScreenHowToPlay overlay/default.lua	
@@ -45,31 +45,47 @@ return Def.ActorFrame {
 	};
 
 	-- messages
-	LoadFont("Common Normal") .. {
+	LoadFont("Common Bold") .. {
 		Text=ScreenString("How To Play StepMania"),
 		InitCommand=cmd(zbuffer,1;z,20;x,SCREEN_CENTER_X;y,SCREEN_CENTER_Y;shadowlength,1;strokecolor,Color("Outline"));
-		OnCommand=cmd(diffusealpha,0;zoom,4;sleep,0.0;linear,0.3;diffusealpha,1;zoom,1;sleep,1.8;linear,0.3;zoom,0.75;x,170;y,60);
+		BeginCommand=function(self)
+			self:AddAttribute(12, {Length=9, Diffuse=Color.Blue});
+		end;
+		OnCommand=cmd(skewx,-0.125;diffuse,color("#ffd400");shadowlength,2;shadowcolor,BoostColor(color("#ffd40077"),0.25);diffusealpha,0;zoom,4;sleep,0.0;linear,0.3;diffusealpha,1;zoom,1;sleep,1.8;linear,0.3;zoom,0.75;x,170;y,60);
 	};
-	LoadActor("feet") .. {
+	LoadActor("_howtoplay feet") .. {
+		InitCommand=cmd(shadowlength,1;strokecolor,Color.Outline);
 		OnCommand=cmd(z,20;x,SCREEN_CENTER_X;y,SCREEN_CENTER_Y;addx,-SCREEN_WIDTH;sleep,2.4;decelerate,0.3;addx,SCREEN_WIDTH;sleep,2;linear,0.3;zoomy,0);
 	};
 
-	LoadActor("_message tap")..{
+	LoadActor("_howtoplay tap")..{
+		InitCommand=cmd(x,SCREEN_CENTER_X+160;y,SCREEN_CENTER_Y+40;diffusealpha,0;);
+		ShowCommand=cmd(linear,0;diffusealpha,1;sleep,2;linear,0;diffusealpha,0);
 		OnCommand=cmd(sleep,6;queuecommand,"Show");
 	};
-	LoadActor("_message tap")..{
+	LoadActor("_howtoplay tap")..{
+		InitCommand=cmd(x,SCREEN_CENTER_X+160;y,SCREEN_CENTER_Y+40;diffusealpha,0;);
+		ShowCommand=cmd(linear,0;diffusealpha,1;sleep,2;linear,0;diffusealpha,0);
 		OnCommand=cmd(sleep,9.7;queuecommand,"Show");
 	};
-	LoadActor("_message tap")..{
+	LoadActor("_howtoplay tap")..{
+		InitCommand=cmd(x,SCREEN_CENTER_X+160;y,SCREEN_CENTER_Y+40;diffusealpha,0;);
+		ShowCommand=cmd(linear,0;diffusealpha,1;sleep,2;linear,0;diffusealpha,0);
 		OnCommand=cmd(sleep,12.7;queuecommand,"Show");
 	};
-	LoadActor("_message tap")..{
+	LoadActor("_howtoplay tap")..{
+		InitCommand=cmd(x,SCREEN_CENTER_X+160;y,SCREEN_CENTER_Y+40;diffusealpha,0;);
+		ShowCommand=cmd(linear,0;diffusealpha,1;sleep,2;linear,0;diffusealpha,0);
 		OnCommand=cmd(sleep,15.7;queuecommand,"Show");
 	};
-	LoadActor("_message jump")..{
+	LoadActor("_howtoplay jump")..{
+		InitCommand=cmd(x,SCREEN_CENTER_X+160;y,SCREEN_CENTER_Y+40;diffusealpha,0;);
+		ShowCommand=cmd(linear,0;diffusealpha,1;sleep,2;linear,0;diffusealpha,0);
 		OnCommand=cmd(sleep,18.7;queuecommand,"Show");
 	};
-	LoadActor("_message miss")..{
+	LoadActor("_howtoplay miss")..{
+		InitCommand=cmd(x,SCREEN_CENTER_X+160;y,SCREEN_CENTER_Y+40;diffusealpha,0;);
+		ShowCommand=cmd(linear,0;diffusealpha,1;sleep,2;linear,0;diffusealpha,0);
 		OnCommand=cmd(sleep,22.7;queuecommand,"Show");
 	};
 };
diff --git a/Themes/default/Graphics/ScreenWithMenuElements Footer.lua b/Themes/default/Graphics/ScreenWithMenuElements Footer.lua
index 465444da46..ac6939946e 100644
--- a/Themes/default/Graphics/ScreenWithMenuElements Footer.lua	
+++ b/Themes/default/Graphics/ScreenWithMenuElements Footer.lua	
@@ -1,7 +1,12 @@
 local t = Def.ActorFrame {};
 
 t[#t+1] = Def.Quad {
-	InitCommand=cmd(vertalign,bottom;zoomto,SCREEN_WIDTH+1,34;diffuse,color("#161616"));
+	InitCommand=cmd(vertalign,bottom;zoomto,SCREEN_WIDTH,34;diffuse,color("#161616"));
+};
+
+t[#t+1] = LoadActor(THEME:GetPathG("ScreenWithMenuElements","header/Header")) .. {
+	InitCommand=cmd(y,-48;vertalign,bottom;zoomtowidth,SCREEN_WIDTH);
+	OnCommand=cmd(zoomy,-1;diffuse,color("#ffd400"));
 };
 
 return t;
diff --git a/Themes/default/Languages/en.ini b/Themes/default/Languages/en.ini
index c351ca1047..27badebb29 100644
--- a/Themes/default/Languages/en.ini
+++ b/Themes/default/Languages/en.ini
@@ -1,4 +1,4 @@
-[Screen]
+`[Screen]
 HelpText=&BACK; Exit &START; Select &SELECT; Options &MENULEFT;&MENURIGHT;&MENUUP;&MENUDOWN; Move
 
 [ScreenWithMenuElements]
@@ -26,6 +26,9 @@ JointPremiumSecondary=Two players can play with one credit!
 DoublesPremiumMain=Doubles Premium
 DoublesPremiumSecondary=Play doubles for one credit!
 
+[ScreenCaution]
+HelpText=&START; Continue
+
 [ScreenDemonstration]
 Demonstration=Demonstration
 %s - %s   [from %s]=%s - %s\n[from %s]
@@ -91,6 +94,9 @@ PersonalRecord=Personal Record #%i!
 ITG DP:=ITG DP:
 MIGS DP:=MIGS DP:
 
+[ScreenContinue]
+HelpText=&START; Advance Timer
+
 [OptionTitles]
 AutoSetStyle=Auto Set Style
 NotePosition=Note Positions
@@ -232,4 +238,4 @@ Play again soon!=Play again soon!
 How To Play StepMania=How To Play StepMania
 
 [Protiming]
-MS=MS
\ No newline at end of file
+MS=MS
diff --git a/Themes/default/metrics.ini b/Themes/default/metrics.ini
index 19f103c685..7561541c36 100644
--- a/Themes/default/metrics.ini
+++ b/Themes/default/metrics.ini
@@ -523,7 +523,7 @@ Fallback="StepsDisplay"
 # end;
 PillTransformFunction=function(self,offsetFromCenter,itemIndex,numItems) \
 	local offset = itemIndex / numItems \
-	local rate = 4 \
+	local rate = 2 \
 	local fItemWidth = ( 256 / numItems ) \
 	self:x( ((itemIndex-(numItems/2))*fItemWidth) + ( numItems / 2 ) ); \
 	self:zoomtowidth(fItemWidth); \
@@ -589,8 +589,8 @@ HeaderOffCommand=
 
 ShowFooter=true
 FooterX=SCREEN_CENTER_X
-FooterY=SCREEN_BOTTOM+2
-FooterOnCommand=draworder,1;vertalign,bottom;zoomtowidth,SCREEN_WIDTH+1;
+FooterY=SCREEN_BOTTOM+4
+FooterOnCommand=draworder,1;
 FooterOffCommand=
 
 ShowHelp=true
@@ -916,6 +916,7 @@ SongTimeX=SCREEN_CENTER_X-160
 SongTimeY=SCREEN_TOP+160+(36/2)+8
 SongTimeOnCommand=zoom,0.75;strokecolor,Color("Outline");shadowlength,1
 
+
 SongTimeOffCommand=bouncebegin,0.15;zoom,0;diffusealpha,0;
 SongTimeResetCommand=diffuse,Color("White");
 SongTimeAutogenCommand=diffuse,Color("Green");

From 65af11af5136c167dac1930313bd78c06f21642a Mon Sep 17 00:00:00 2001
From: Jonathan Payne <potentj@gmail.com>
Date: Sun, 31 Aug 2014 22:32:11 -0700
Subject: [PATCH 02/24] Fix up HowToPlay graphics (2)

---
 .../_howtoplay jump.lua                       |  6 +-
 .../_howtoplay miss.lua                       |  6 +-
 .../_howtoplay tap.lua                        |  6 +-
 .../ScreenHowToPlay overlay/_message jump.lua |  6 --
 .../ScreenHowToPlay overlay/_message miss.lua |  6 --
 .../ScreenHowToPlay overlay/_message tap.lua  |  6 --
 .../ScreenHowToPlay overlay/default.lua       | 69 ++++++++++---------
 Themes/default/metrics.ini                    |  3 +-
 8 files changed, 47 insertions(+), 61 deletions(-)
 delete mode 100644 Themes/default/BGAnimations/ScreenHowToPlay overlay/_message jump.lua
 delete mode 100644 Themes/default/BGAnimations/ScreenHowToPlay overlay/_message miss.lua
 delete mode 100644 Themes/default/BGAnimations/ScreenHowToPlay overlay/_message tap.lua

diff --git a/Themes/default/BGAnimations/ScreenHowToPlay overlay/_howtoplay jump.lua b/Themes/default/BGAnimations/ScreenHowToPlay overlay/_howtoplay jump.lua
index 554a0b1e22..046bccb804 100644
--- a/Themes/default/BGAnimations/ScreenHowToPlay overlay/_howtoplay jump.lua	
+++ b/Themes/default/BGAnimations/ScreenHowToPlay overlay/_howtoplay jump.lua	
@@ -1,13 +1,13 @@
 return Def.ActorFrame {
-	LoadActor(THEME:GetPathB("_frame","3x3"),"rounded black",392+8,80);
+	LoadActor(THEME:GetPathB("_frame","3x3"),"rounded black",380,80);
 	Def.Quad {
 		Name="Underline";
-		InitCommand=cmd(y,-10);
+		InitCommand=cmd(y,-12);
 		OnCommand=cmd(diffuse,color("#ffd400");shadowlength,1;zoomtowidth,192;fadeleft,0.25;faderight,0.25);
 	};
 	LoadFont("Common Bold") .. {
 		Text="Information";
-		InitCommand=cmd(y,-24);
+		InitCommand=cmd(y,-26);
 		OnCommand=cmd(skewx,-0.125;diffuse,color("#ffd400");shadowlength,2;shadowcolor,BoostColor(color("#ffd40077"),0.25))
 	};
 	LoadFont("Common Normal") .. {
diff --git a/Themes/default/BGAnimations/ScreenHowToPlay overlay/_howtoplay miss.lua b/Themes/default/BGAnimations/ScreenHowToPlay overlay/_howtoplay miss.lua
index d13cf36766..b1aeb93ecf 100644
--- a/Themes/default/BGAnimations/ScreenHowToPlay overlay/_howtoplay miss.lua	
+++ b/Themes/default/BGAnimations/ScreenHowToPlay overlay/_howtoplay miss.lua	
@@ -1,13 +1,13 @@
 return Def.ActorFrame {
-	LoadActor(THEME:GetPathB("_frame","3x3"),"rounded black",392+8,80);
+	LoadActor(THEME:GetPathB("_frame","3x3"),"rounded black",380,80);
 	Def.Quad {
 		Name="Underline";
-		InitCommand=cmd(y,-10);
+		InitCommand=cmd(y,-12);
 		OnCommand=cmd(diffuse,color("#ffd400");shadowlength,1;zoomtowidth,192;fadeleft,0.25;faderight,0.25);
 	};
 	LoadFont("Common Bold") .. {
 		Text="Information";
-		InitCommand=cmd(y,-24);
+		InitCommand=cmd(y,-26);
 		OnCommand=cmd(skewx,-0.125;diffuse,color("#ffd400");shadowlength,2;shadowcolor,BoostColor(color("#ffd40077"),0.25))
 	};
 	LoadFont("Common Normal") .. {
diff --git a/Themes/default/BGAnimations/ScreenHowToPlay overlay/_howtoplay tap.lua b/Themes/default/BGAnimations/ScreenHowToPlay overlay/_howtoplay tap.lua
index ad31a5d3a3..d5f026270f 100644
--- a/Themes/default/BGAnimations/ScreenHowToPlay overlay/_howtoplay tap.lua	
+++ b/Themes/default/BGAnimations/ScreenHowToPlay overlay/_howtoplay tap.lua	
@@ -1,13 +1,13 @@
 return Def.ActorFrame {
-	LoadActor(THEME:GetPathB("_frame","3x3"),"rounded black",392+8,80);
+	LoadActor(THEME:GetPathB("_frame","3x3"),"rounded black",380,80);
 	Def.Quad {
 		Name="Underline";
-		InitCommand=cmd(y,-10);
+		InitCommand=cmd(y,-12);
 		OnCommand=cmd(diffuse,color("#ffd400");shadowlength,1;zoomtowidth,192;fadeleft,0.25;faderight,0.25);
 	};
 	LoadFont("Common Bold") .. {
 		Text="Information";
-		InitCommand=cmd(y,-24);
+		InitCommand=cmd(y,-26);
 		OnCommand=cmd(skewx,-0.125;diffuse,color("#ffd400");shadowlength,2;shadowcolor,BoostColor(color("#ffd40077"),0.25))
 	};
 	LoadFont("Common Normal") .. {
diff --git a/Themes/default/BGAnimations/ScreenHowToPlay overlay/_message jump.lua b/Themes/default/BGAnimations/ScreenHowToPlay overlay/_message jump.lua
deleted file mode 100644
index ca12423f28..0000000000
--- a/Themes/default/BGAnimations/ScreenHowToPlay overlay/_message jump.lua	
+++ /dev/null
@@ -1,6 +0,0 @@
-return Def.ActorFrame{
-	LoadActor("jumpmessage") .. {
-		InitCommand=cmd(x,SCREEN_CENTER_X+160;y,SCREEN_CENTER_Y+40;diffusealpha,0;);
-		ShowCommand=cmd(linear,0;diffusealpha,1;sleep,1.7;linear,0;diffusealpha,0);
-	};
-};
\ No newline at end of file
diff --git a/Themes/default/BGAnimations/ScreenHowToPlay overlay/_message miss.lua b/Themes/default/BGAnimations/ScreenHowToPlay overlay/_message miss.lua
deleted file mode 100644
index b573579a14..0000000000
--- a/Themes/default/BGAnimations/ScreenHowToPlay overlay/_message miss.lua	
+++ /dev/null
@@ -1,6 +0,0 @@
-return Def.ActorFrame{
-	LoadActor("missmessage") .. {
-		InitCommand=cmd(x,SCREEN_CENTER_X+160;y,SCREEN_CENTER_Y+40;diffusealpha,0;);
-		ShowCommand=cmd(linear,0;diffusealpha,1;sleep,22.7;linear,0;diffusealpha,0);
-	};
-};
\ No newline at end of file
diff --git a/Themes/default/BGAnimations/ScreenHowToPlay overlay/_message tap.lua b/Themes/default/BGAnimations/ScreenHowToPlay overlay/_message tap.lua
deleted file mode 100644
index 1b53a61643..0000000000
--- a/Themes/default/BGAnimations/ScreenHowToPlay overlay/_message tap.lua	
+++ /dev/null
@@ -1,6 +0,0 @@
-return Def.ActorFrame{
-	LoadActor("tapmessage") .. {
-		InitCommand=cmd(x,SCREEN_CENTER_X+160;y,SCREEN_CENTER_Y+40;diffusealpha,0;);
-		ShowCommand=cmd(linear,0;diffusealpha,1;sleep,2;linear,0;diffusealpha,0);
-	};
-};
\ No newline at end of file
diff --git a/Themes/default/BGAnimations/ScreenHowToPlay overlay/default.lua b/Themes/default/BGAnimations/ScreenHowToPlay overlay/default.lua
index 7d360c871b..025e7cf485 100644
--- a/Themes/default/BGAnimations/ScreenHowToPlay overlay/default.lua	
+++ b/Themes/default/BGAnimations/ScreenHowToPlay overlay/default.lua	
@@ -49,43 +49,46 @@ return Def.ActorFrame {
 		Text=ScreenString("How To Play StepMania"),
 		InitCommand=cmd(zbuffer,1;z,20;x,SCREEN_CENTER_X;y,SCREEN_CENTER_Y;shadowlength,1;strokecolor,Color("Outline"));
 		BeginCommand=function(self)
-			self:AddAttribute(12, {Length=9, Diffuse=Color.Blue});
+			self:AddAttribute(12, {Length=9, Diffuse=Color.White});
 		end;
 		OnCommand=cmd(skewx,-0.125;diffuse,color("#ffd400");shadowlength,2;shadowcolor,BoostColor(color("#ffd40077"),0.25);diffusealpha,0;zoom,4;sleep,0.0;linear,0.3;diffusealpha,1;zoom,1;sleep,1.8;linear,0.3;zoom,0.75;x,170;y,60);
 	};
 	LoadActor("_howtoplay feet") .. {
-		InitCommand=cmd(shadowlength,1;strokecolor,Color.Outline);
-		OnCommand=cmd(z,20;x,SCREEN_CENTER_X;y,SCREEN_CENTER_Y;addx,-SCREEN_WIDTH;sleep,2.4;decelerate,0.3;addx,SCREEN_WIDTH;sleep,2;linear,0.3;zoomy,0);
+			InitCommand=cmd(shadowlength,1;strokecolor,Color.Outline);
+			OnCommand=cmd(z,20;x,SCREEN_CENTER_X;y,SCREEN_CENTER_Y;addx,-SCREEN_WIDTH;sleep,2.4;decelerate,0.3;addx,SCREEN_WIDTH;sleep,2;linear,0.3;zoomy,0);
 	};
-
-	LoadActor("_howtoplay tap")..{
-		InitCommand=cmd(x,SCREEN_CENTER_X+160;y,SCREEN_CENTER_Y+40;diffusealpha,0;);
-		ShowCommand=cmd(linear,0;diffusealpha,1;sleep,2;linear,0;diffusealpha,0);
-		OnCommand=cmd(sleep,6;queuecommand,"Show");
-	};
-	LoadActor("_howtoplay tap")..{
-		InitCommand=cmd(x,SCREEN_CENTER_X+160;y,SCREEN_CENTER_Y+40;diffusealpha,0;);
-		ShowCommand=cmd(linear,0;diffusealpha,1;sleep,2;linear,0;diffusealpha,0);
-		OnCommand=cmd(sleep,9.7;queuecommand,"Show");
-	};
-	LoadActor("_howtoplay tap")..{
-		InitCommand=cmd(x,SCREEN_CENTER_X+160;y,SCREEN_CENTER_Y+40;diffusealpha,0;);
-		ShowCommand=cmd(linear,0;diffusealpha,1;sleep,2;linear,0;diffusealpha,0);
-		OnCommand=cmd(sleep,12.7;queuecommand,"Show");
-	};
-	LoadActor("_howtoplay tap")..{
-		InitCommand=cmd(x,SCREEN_CENTER_X+160;y,SCREEN_CENTER_Y+40;diffusealpha,0;);
-		ShowCommand=cmd(linear,0;diffusealpha,1;sleep,2;linear,0;diffusealpha,0);
-		OnCommand=cmd(sleep,15.7;queuecommand,"Show");
-	};
-	LoadActor("_howtoplay jump")..{
-		InitCommand=cmd(x,SCREEN_CENTER_X+160;y,SCREEN_CENTER_Y+40;diffusealpha,0;);
-		ShowCommand=cmd(linear,0;diffusealpha,1;sleep,2;linear,0;diffusealpha,0);
-		OnCommand=cmd(sleep,18.7;queuecommand,"Show");
-	};
-	LoadActor("_howtoplay miss")..{
-		InitCommand=cmd(x,SCREEN_CENTER_X+160;y,SCREEN_CENTER_Y+40;diffusealpha,0;);
-		ShowCommand=cmd(linear,0;diffusealpha,1;sleep,2;linear,0;diffusealpha,0);
-		OnCommand=cmd(sleep,22.7;queuecommand,"Show");
+	Def.ActorFrame {
+		InitCommand=cmd(x,SCREEN_CENTER_X+120;y,SCREEN_CENTER_Y+40);
+		
+		LoadActor("_howtoplay tap")..{
+			InitCommand=cmd(diffusealpha,0);
+			ShowCommand=cmd(linear,0;diffusealpha,1;sleep,2;linear,0;diffusealpha,0);
+			OnCommand=cmd(sleep,6;queuecommand,"Show");
+		};
+		LoadActor("_howtoplay tap")..{
+			InitCommand=cmd(diffusealpha,0);
+			ShowCommand=cmd(linear,0;diffusealpha,1;sleep,2;linear,0;diffusealpha,0);
+			OnCommand=cmd(sleep,9.7;queuecommand,"Show");
+		};
+		LoadActor("_howtoplay tap")..{
+			InitCommand=cmd(diffusealpha,0);
+			ShowCommand=cmd(linear,0;diffusealpha,1;sleep,2;linear,0;diffusealpha,0);
+			OnCommand=cmd(sleep,12.7;queuecommand,"Show");
+		};
+		LoadActor("_howtoplay tap")..{
+			InitCommand=cmd(diffusealpha,0);
+			ShowCommand=cmd(linear,0;diffusealpha,1;sleep,2;linear,0;diffusealpha,0);
+			OnCommand=cmd(sleep,15.7;queuecommand,"Show");
+		};
+		LoadActor("_howtoplay jump")..{
+			InitCommand=cmd(diffusealpha,0);
+			ShowCommand=cmd(linear,0;diffusealpha,1;sleep,2;linear,0;diffusealpha,0);
+			OnCommand=cmd(sleep,18.7;queuecommand,"Show");
+		};
+		LoadActor("_howtoplay miss")..{
+			InitCommand=cmd(diffusealpha,0);
+			ShowCommand=cmd(linear,0;diffusealpha,1;sleep,2;linear,0;diffusealpha,0);
+			OnCommand=cmd(sleep,22.7;queuecommand,"Show");
+		};
 	};
 };
diff --git a/Themes/default/metrics.ini b/Themes/default/metrics.ini
index 7561541c36..4fb8fff57e 100644
--- a/Themes/default/metrics.ini
+++ b/Themes/default/metrics.ini
@@ -532,7 +532,7 @@ PillTransformFunction=function(self,offsetFromCenter,itemIndex,numItems) \
 	self:effectcolor1(color("0.5,0.5,0.5,1")); \
 	self:effectclock('beat'); \
 	self:effecttiming(rate*0.75,rate*0.125,rate*0.125,0); \
-	self:effectoffset(1.25-offset); \
+	self:effectoffset(1-offset); \
 end;
 # PillTransformFunction=function(self,offsetFromCenter,itemIndex,numItems) \
 	# local fItemWidth = ( 256 / numItems ) \
@@ -1871,6 +1871,7 @@ MachineRecordP2X=SCREEN_CENTER_X+220
 #MachineRecordP2Y=SCREEN_BOTTOM-156
 MachineRecordP2Y=SCREEN_TOP+146
 MachineRecordP2OnCommand=
+
 MachineRecordP2OffCommand=
 #
 PersonalRecordP1X=SCREEN_CENTER_X-160

From a64669b1bc9c04647268b4ee35b110109c857d47 Mon Sep 17 00:00:00 2001
From: Jonathan Payne <potentj@gmail.com>
Date: Sun, 31 Aug 2014 23:08:06 -0700
Subject: [PATCH 03/24] Make TwoPartSelection dialog work for all players

---
 .../ScreenSelectMusic overlay.lua             | 61 +++++++++++++++----
 Themes/default/metrics.ini                    |  3 +-
 2 files changed, 50 insertions(+), 14 deletions(-)

diff --git a/Themes/default/BGAnimations/ScreenSelectMusic overlay.lua b/Themes/default/BGAnimations/ScreenSelectMusic overlay.lua
index 2ad45d1d7d..55a4b7fb15 100644
--- a/Themes/default/BGAnimations/ScreenSelectMusic overlay.lua	
+++ b/Themes/default/BGAnimations/ScreenSelectMusic overlay.lua	
@@ -1,3 +1,10 @@
+local num_players = GAMESTATE:GetHumanPlayers();
+local function PositionItem(i,max)
+	local x_spacing = 128; 
+	return x_spacing * (i-(max-1)/2);
+end
+
+
 local t = Def.ActorFrame {
 	FOV=90;
 	--
@@ -5,21 +12,49 @@ local t = Def.ActorFrame {
 		InitCommand=cmd(zoomto,SCREEN_CENTER_X+80,SCREEN_HEIGHT);
 		OnCommand=cmd(diffuse,Color.Black;diffusealpha,0.75;fadeleft,32/SCREEN_CENTER_X;faderight,32/SCREEN_CENTER_X);
 	};
-	LoadActor( NOTESKIN:GetPathForNoteSkin("Center","Tap","cmd") ) .. {
-		InitCommand=cmd(y,20);
-	};
-	LoadFont("Common Bold") .. {
-		Text="PRESS";
-		InitCommand=cmd(y,-20);
-		OnCommand=cmd(shadowlength,1;pulse;effectmagnitude,1,1.125,1;effectperiod,0.5);
-	};
-	LoadFont("Common Bold") .. {
-		Text="TO START";
-		InitCommand=cmd(y,58);
-		OnCommand=cmd(shadowlength,1;zoom,0.875);
-	};
 };
+--
+for i=1,#num_players do
+	t[#t+1] = Def.ActorFrame {
+		InitCommand=cmd(x,-128+PositionItem(i,#num_players));
+		UnchosenCommand=cmd(finishtweening;bounceend,0.25;zoom,1);
+		ChosenCommand=cmd(stoptweening;bouncebegin,0.3;zoom,0);
+		--
+		StepsChosenMessageCommand=function( self, param ) 
+			if param.Player ~= num_players[i] then return end;
+			self:playcommand("Chosen");
+		end;
+		StepsUnchosenMessageCommand=function( self, param ) 
+			if param.Player ~= num_players[i] then return end;
+			self:playcommand("Unchosen");
+		end;
+		--
+		LoadActor( NOTESKIN:GetPathForNoteSkin("Center","Tap","cmd") ) .. {
+			InitCommand=cmd(y,20);
+		};
+		Def.Quad {
+			InitCommand=cmd(y,-35);
+			OnCommand=cmd(diffuse,PlayerColor(num_players[i]);shadowlength,1;linear,0.25;zoomtowidth,80;fadeleft,0.5;faderight,0.5);
+		};
+		LoadFont("Common Bold") .. {
+			Text=ToEnumShortString(num_players[i]);
+			InitCommand=cmd(y,-48);
+			OnCommand=cmd(shadowlength,1;diffuse,PlayerColor(num_players[i]));
+		};
+		LoadFont("Common Bold") .. {
+			Text="PRESS";
+			InitCommand=cmd(y,-20);
+			OnCommand=cmd(shadowlength,1;pulse;effectmagnitude,1,1.125,1;effectperiod,0.5);
+		};
+		LoadFont("Common Normal") .. {
+			Text="TO START";
+			InitCommand=cmd(y,58);
+			OnCommand=cmd(shadowlength,1;zoom,0.75);
+		};
+	};
+end
 
+--
 t.InitCommand=cmd(Center;x,SCREEN_CENTER_X*1.5;visible,false;diffusealpha,0);
 t.StartSelectingStepsMessageCommand=cmd(linear,0.2;visible,true;diffusealpha,1);
 t.StartSelectingSongMessageCommand=cmd(linear,0.2;visible,true;diffusealpha,0);
diff --git a/Themes/default/metrics.ini b/Themes/default/metrics.ini
index 4fb8fff57e..92cb0fb08c 100644
--- a/Themes/default/metrics.ini
+++ b/Themes/default/metrics.ini
@@ -698,6 +698,7 @@ ShowVersionInfo=true
 VersionInfoX=SCREEN_RIGHT-16
 VersionInfoY=SCREEN_TOP+24
 VersionInfoOnCommand=
+
 VersionInfoOffCommand=
 #
 ShowNetworkStatus=true
@@ -984,7 +985,7 @@ ShowDifficultyList=not GAMESTATE:IsCourseMode();
 DifficultyListX=SCREEN_CENTER_X-160
 DifficultyListY=SCREEN_TOP+216
 DifficultyListOnCommand=addx,-SCREEN_CENTER_X;decelerate,0.1;addx,SCREEN_CENTER_X;
-DifficultyListStartSelectingStepsMessageCommand=finishtweening;glowshift;effectcolor1,color("1,1,1,0.25");effectcolor2,color("1,1,1,0");effectperiod,2;
+DifficultyListStartSelectingStepsMessageCommand=finishtweening;accelerate,0.2;zoom,1.1;decelerate,0.2;zoom,1;
 DifficultyListOffCommand=bouncebegin,0.05;zoomx,0;
 #
 DifficultyListTweenOnCommand=stoptweening;bounceend,0.1;zoomx,1

From b6ff29fdd8c6e09cd0103eefff8f095d4cb533fa Mon Sep 17 00:00:00 2001
From: Jonathan Payne <potentj@gmail.com>
Date: Sun, 31 Aug 2014 23:26:23 -0700
Subject: [PATCH 04/24] Make TwoPartSelection dialog hide on events

---
 .../BGAnimations/ScreenSelectMusic overlay.lua       | 12 +++++++++---
 .../BGAnimations/ScreenSelectMusic underlay.lua      |  1 +
 2 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/Themes/default/BGAnimations/ScreenSelectMusic overlay.lua b/Themes/default/BGAnimations/ScreenSelectMusic overlay.lua
index 55a4b7fb15..f7326baa14 100644
--- a/Themes/default/BGAnimations/ScreenSelectMusic overlay.lua	
+++ b/Themes/default/BGAnimations/ScreenSelectMusic overlay.lua	
@@ -53,9 +53,15 @@ for i=1,#num_players do
 		};
 	};
 end
+-- Lock input for half a second so that players don't accidentally start a song
+t[#t+1] = Def.Actor { 
+	StartSelectingStepsMessageCommand=function() SCREENMAN:GetTopScreen():lockinput(0.5); end;
+};
 
 --
-t.InitCommand=cmd(Center;x,SCREEN_CENTER_X*1.5;visible,false;diffusealpha,0);
-t.StartSelectingStepsMessageCommand=cmd(linear,0.2;visible,true;diffusealpha,1);
-t.StartSelectingSongMessageCommand=cmd(linear,0.2;visible,true;diffusealpha,0);
+t.InitCommand=cmd(Center;x,SCREEN_CENTER_X*1.5;diffusealpha,0);
+t.StartSelectingStepsMessageCommand=cmd(linear,0.2;diffusealpha,1);
+t.SongUnchosenMessageCommand=cmd(linear,0.2;diffusealpha,0);
+
+
 return t;
diff --git a/Themes/default/BGAnimations/ScreenSelectMusic underlay.lua b/Themes/default/BGAnimations/ScreenSelectMusic underlay.lua
index a2ea2dcdac..9cf9211740 100644
--- a/Themes/default/BGAnimations/ScreenSelectMusic underlay.lua	
+++ b/Themes/default/BGAnimations/ScreenSelectMusic underlay.lua	
@@ -3,6 +3,7 @@ local t = Def.ActorFrame {
 		InitCommand=cmd(zoomto,SCREEN_WIDTH,SCREEN_HEIGHT);
 		OnCommand=cmd(diffuse,Color.Black;diffusealpha,0);
 		StartSelectingStepsMessageCommand=cmd(stoptweening;linear,0.2;diffusealpha,0.75);
+		SongUnchosenMessageCommand=cmd(stoptweening;linear,0.2;diffusealpha,0);
 	};
 };
 

From 4fdbb3dff6eb20296afc4012da4ada2713c68ecf Mon Sep 17 00:00:00 2001
From: Jonathan Payne <potentj@gmail.com>
Date: Sun, 31 Aug 2014 23:50:08 -0700
Subject: [PATCH 05/24] ScoreDisplay has actual shadows now...

---
 Themes/_fallback/Scripts/02 Colors.lua | 14 +++++++-------
 Themes/default/metrics.ini             | 13 ++++++++-----
 2 files changed, 15 insertions(+), 12 deletions(-)

diff --git a/Themes/_fallback/Scripts/02 Colors.lua b/Themes/_fallback/Scripts/02 Colors.lua
index fd36d2591d..ebe8bfc464 100644
--- a/Themes/_fallback/Scripts/02 Colors.lua	
+++ b/Themes/_fallback/Scripts/02 Colors.lua	
@@ -12,7 +12,7 @@ Color = {
 	Yellow		=	color("#fff200"),
 	Orange		=	color("#f7941d"),
 	Purple		=	color("#92278f"),
-	Outline		=	color("0,0,0,0.675"),
+	Outline		=	color("0,0,0,0.5"),
 	Invisible	=	color("1,1,1,0"),
 	Stealth		=	color("0,0,0,0"),
 -- Android Design Stencil Colors
@@ -47,8 +47,8 @@ setmetatable(Color, { __call = function(self, c) return self[c] end })
 
 GameColor = {
 	PlayerColors = {
-		PLAYER_1 = color("#ef403d"),
-		PLAYER_2 = color("#0089cf"),
+		PLAYER_1 = color("#ff4444"),
+		PLAYER_2 = color("#5d9cec"),
 	},
 	Difficulty = {
 		--[[ These are for 'Custom' Difficulty Ranks. It can be very  useful
@@ -126,13 +126,13 @@ function ColorDarkTone(c)
 end
 
 function PlayerColor( pn )
-	if pn == PLAYER_1 then return color("#ef403d") end -- pink-red
-	if pn == PLAYER_2 then return color("#0089cf") end -- sea-blue
+	if pn == PLAYER_1 then return GameColor.PlayerColors["PLAYER_1"] end -- pink-red
+	if pn == PLAYER_2 then return GameColor.PlayerColors["PLAYER_2"] end -- sea-blue
 	return color("1,1,1,1")
 end
 function PlayerScoreColor( pn )
-	if pn == PLAYER_1 then return color("#ef403d") end -- pink-red
-	if pn == PLAYER_2 then return color("#0089cf") end -- sea-blue
+	if pn == PLAYER_1 then return GameColor.PlayerColors["PLAYER_1"] end -- pink-red
+	if pn == PLAYER_2 then return GameColor.PlayerColors["PLAYER_2"] end -- sea-blue
 	return color("1,1,1,1")
 end
 
diff --git a/Themes/default/metrics.ini b/Themes/default/metrics.ini
index 92cb0fb08c..fe4c55865d 100644
--- a/Themes/default/metrics.ini
+++ b/Themes/default/metrics.ini
@@ -370,12 +370,14 @@ FrameOnCommand=visible,false;spin
 TimeRemainingY=80
 TimeRemainingOnCommand=zoom,1;shadowlength,1;
 #
-DeltaSecondsOnCommand=y,80;spin;
+DeltaSecondsOnCommand=y,80;
 DeltaSecondsGainLifeCommand=zoom,0.5;
 
 [ScoreDisplayPercentage Percent]
-PercentP1OnCommand=shadowlength,1;diffuse,PlayerColor(PLAYER_1);strokecolor,ColorDarkTone(PlayerColor(PLAYER_1))
-PercentP2OnCommand=shadowlength,1;diffuse,PlayerColor(PLAYER_2);strokecolor,ColorDarkTone(PlayerColor(PLAYER_2))
+PercentP1OnCommand=shadowlength,1;diffuse,PlayerColor(PLAYER_1);strokecolor,Color.Outline
+PercentP2OnCommand=shadowlength,1;diffuse,PlayerColor(PLAYER_2);strokecolor,Color.Outline
+DancePointsP1OnCommand=shadowlength,1;diffuse,PlayerColor(PLAYER_1);strokecolor,Color.Outline
+DancePointsP2OnCommand=shadowlength,1;diffuse,PlayerColor(PLAYER_2);strokecolor,Color.Outline
 
 [ScoreDisplayRave]
 MeterP1OnCommand=draworder,-1;texcoordvelocity,1,0
@@ -523,15 +525,15 @@ Fallback="StepsDisplay"
 # end;
 PillTransformFunction=function(self,offsetFromCenter,itemIndex,numItems) \
 	local offset = itemIndex / numItems \
-	local rate = 2 \
+	local rate = 4 \
 	local fItemWidth = ( 256 / numItems ) \
 	self:x( ((itemIndex-(numItems/2))*fItemWidth) + ( numItems / 2 ) ); \
 	self:zoomtowidth(fItemWidth); \
 	self:diffuseramp(); \
 	self:effectcolor2(color("1,1,1,1")); \
 	self:effectcolor1(color("0.5,0.5,0.5,1")); \
+	self:effectperiod(rate); \
 	self:effectclock('beat'); \
-	self:effecttiming(rate*0.75,rate*0.125,rate*0.125,0); \
 	self:effectoffset(1-offset); \
 end;
 # PillTransformFunction=function(self,offsetFromCenter,itemIndex,numItems) \
@@ -699,6 +701,7 @@ VersionInfoX=SCREEN_RIGHT-16
 VersionInfoY=SCREEN_TOP+24
 VersionInfoOnCommand=
 
+
 VersionInfoOffCommand=
 #
 ShowNetworkStatus=true

From 0abdaa513d420a0a8516179d35db05b8bc385fb3 Mon Sep 17 00:00:00 2001
From: Jonathan Payne <potentj@gmail.com>
Date: Mon, 1 Sep 2014 04:49:26 -0700
Subject: [PATCH 06/24] Continue now goes to SelectStyle. Fixes error

---
 Themes/_fallback/Scripts/02 Branches.lua | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Themes/_fallback/Scripts/02 Branches.lua b/Themes/_fallback/Scripts/02 Branches.lua
index 6430b459cd..81f19ec563 100644
--- a/Themes/_fallback/Scripts/02 Branches.lua	
+++ b/Themes/_fallback/Scripts/02 Branches.lua	
@@ -232,7 +232,7 @@ Branch = {
 		end
 
 		if STATSMAN:GetStagesPlayed() == 0 then
-			return "ScreenSelectPlayMode"
+			return "ScreenSelectStyle"
 		end
 
 		return "ScreenProfileLoad"

From d9d735e44ae0c595c29f2da5e0e8104cb7711a2c Mon Sep 17 00:00:00 2001
From: Jonathan Payne <potentj@gmail.com>
Date: Mon, 1 Sep 2014 05:38:33 -0700
Subject: [PATCH 07/24] TwoPartSelection noteskin for pump only, routine skins

---
 Themes/_fallback/Scripts/02 Colors.lua        | 19 ++++++++++++++-----
 .../ScreenSelectMusic overlay.lua             | 13 ++++++++-----
 Themes/default/metrics.ini                    | 13 +++++++------
 3 files changed, 29 insertions(+), 16 deletions(-)

diff --git a/Themes/_fallback/Scripts/02 Colors.lua b/Themes/_fallback/Scripts/02 Colors.lua
index ebe8bfc464..3fe7335e3d 100644
--- a/Themes/_fallback/Scripts/02 Colors.lua	
+++ b/Themes/_fallback/Scripts/02 Colors.lua	
@@ -47,9 +47,13 @@ setmetatable(Color, { __call = function(self, c) return self[c] end })
 
 GameColor = {
 	PlayerColors = {
-		PLAYER_1 = color("#ff4444"),
+		PLAYER_1 = color("#ed5565"),
 		PLAYER_2 = color("#5d9cec"),
 	},
+	PlayerDarkColors = {
+		PLAYER_1 = color("#da4453"),
+		PLAYER_2 = color("#4a89dc"),
+	},
 	Difficulty = {
 		--[[ These are for 'Custom' Difficulty Ranks. It can be very  useful
 		in some cases, especially to apply new colors for stuff you
@@ -126,13 +130,18 @@ function ColorDarkTone(c)
 end
 
 function PlayerColor( pn )
-	if pn == PLAYER_1 then return GameColor.PlayerColors["PLAYER_1"] end -- pink-red
-	if pn == PLAYER_2 then return GameColor.PlayerColors["PLAYER_2"] end -- sea-blue
+	if pn == PLAYER_1 then return GameColor.PlayerColors["PLAYER_1"] end
+	if pn == PLAYER_2 then return GameColor.PlayerColors["PLAYER_2"] end
 	return color("1,1,1,1")
 end
+
 function PlayerScoreColor( pn )
-	if pn == PLAYER_1 then return GameColor.PlayerColors["PLAYER_1"] end -- pink-red
-	if pn == PLAYER_2 then return GameColor.PlayerColors["PLAYER_2"] end -- sea-blue
+	return PlayerColor( pn );
+end
+
+function PlayerDarkColor( pn )
+	if pn == PLAYER_1 then return GameColor.PlayerDarkColors["PLAYER_1"] end 
+	if pn == PLAYER_2 then return GameColor.PlayerDarkColors["PLAYER_2"] end
 	return color("1,1,1,1")
 end
 
diff --git a/Themes/default/BGAnimations/ScreenSelectMusic overlay.lua b/Themes/default/BGAnimations/ScreenSelectMusic overlay.lua
index f7326baa14..8e20872d73 100644
--- a/Themes/default/BGAnimations/ScreenSelectMusic overlay.lua	
+++ b/Themes/default/BGAnimations/ScreenSelectMusic overlay.lua	
@@ -15,7 +15,7 @@ local t = Def.ActorFrame {
 };
 --
 for i=1,#num_players do
-	t[#t+1] = Def.ActorFrame {
+	local f = Def.ActorFrame {
 		InitCommand=cmd(x,-128+PositionItem(i,#num_players));
 		UnchosenCommand=cmd(finishtweening;bounceend,0.25;zoom,1);
 		ChosenCommand=cmd(stoptweening;bouncebegin,0.3;zoom,0);
@@ -28,10 +28,6 @@ for i=1,#num_players do
 			if param.Player ~= num_players[i] then return end;
 			self:playcommand("Unchosen");
 		end;
-		--
-		LoadActor( NOTESKIN:GetPathForNoteSkin("Center","Tap","cmd") ) .. {
-			InitCommand=cmd(y,20);
-		};
 		Def.Quad {
 			InitCommand=cmd(y,-35);
 			OnCommand=cmd(diffuse,PlayerColor(num_players[i]);shadowlength,1;linear,0.25;zoomtowidth,80;fadeleft,0.5;faderight,0.5);
@@ -52,6 +48,13 @@ for i=1,#num_players do
 			OnCommand=cmd(shadowlength,1;zoom,0.75);
 		};
 	};
+	if GAMESTATE:GetCurrentGame():GetName() == "pump" then
+		local ns = num_players[i] == PLAYER_1 and RoutineSkinP1() or RoutineSkinP2()
+		f[#f+1] = LoadActor( NOTESKIN:GetPathForNoteSkin("Center","Tap",ns) ) .. {
+			InitCommand=cmd(y,20);
+		}
+	end
+	t[#t+1] = f;
 end
 -- Lock input for half a second so that players don't accidentally start a song
 t[#t+1] = Def.Actor { 
diff --git a/Themes/default/metrics.ini b/Themes/default/metrics.ini
index fe4c55865d..3eb592a0ed 100644
--- a/Themes/default/metrics.ini
+++ b/Themes/default/metrics.ini
@@ -374,10 +374,10 @@ DeltaSecondsOnCommand=y,80;
 DeltaSecondsGainLifeCommand=zoom,0.5;
 
 [ScoreDisplayPercentage Percent]
-PercentP1OnCommand=shadowlength,1;diffuse,PlayerColor(PLAYER_1);strokecolor,Color.Outline
-PercentP2OnCommand=shadowlength,1;diffuse,PlayerColor(PLAYER_2);strokecolor,Color.Outline
-DancePointsP1OnCommand=shadowlength,1;diffuse,PlayerColor(PLAYER_1);strokecolor,Color.Outline
-DancePointsP2OnCommand=shadowlength,1;diffuse,PlayerColor(PLAYER_2);strokecolor,Color.Outline
+PercentP1OnCommand=shadowlength,1;strokecolor,Color.Outline
+PercentP2OnCommand=shadowlength,1;strokecolor,Color.Outline
+DancePointsP1OnCommand=shadowlength,1;strokecolor,Color.Outline
+DancePointsP2OnCommand=shadowlength,1;strokecolor,Color.Outline
 
 [ScoreDisplayRave]
 MeterP1OnCommand=draworder,-1;texcoordvelocity,1,0
@@ -564,9 +564,10 @@ Fallback="TextBanner"
 
 [ScreenSystemLayer]
 ShowClock=true
-CreditsP1OnCommand=horizalign,left;vertalign,bottom;zoom,0.675;shadowlength,1;
+CreditsP1OnCommand=horizalign,left;vertalign,bottom;zoom,0.675;shadowlength,1;diffuse,PlayerColor(PLAYER_1);diffusetopedge,ColorLightTone(PlayerColor(PLAYER_1));
+#
+CreditsP2OnCommand=horizalign,right;vertalign,bottom;zoom,0.675;shadowlength,1;diffuse,PlayerColor(PLAYER_2);diffusetopedge,ColorLightTone(PlayerColor(PLAYER_2));
 #
-CreditsP2OnCommand=horizalign,right;vertalign,bottom;zoom,0.675;shadowlength,1;
 
 [ScreenConsoleOverlay]
 

From 76a255eacc070da6d1765d47722aa4c4f08a0a88 Mon Sep 17 00:00:00 2001
From: Colby Klein <shakesoda@gmail.com>
Date: Mon, 1 Sep 2014 10:28:25 -0700
Subject: [PATCH 08/24] Add people to credits.

---
 Themes/_fallback/BGAnimations/ScreenCredits overlay.lua | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/Themes/_fallback/BGAnimations/ScreenCredits overlay.lua b/Themes/_fallback/BGAnimations/ScreenCredits overlay.lua
index 02a2299b0c..8609c97488 100644
--- a/Themes/_fallback/BGAnimations/ScreenCredits overlay.lua	
+++ b/Themes/_fallback/BGAnimations/ScreenCredits overlay.lua	
@@ -51,10 +51,13 @@ local contrib = {
 	"Chris Eldridge (kurisu)", -- dance-threepanel stepstype support
 	"Christophe Goulet-LeBlanc (Kommisar)", -- songs
 	"corec", -- various fixes
+	"cybik", -- Android port
 	"galopin", -- piu PlayStation2 usb mat support
 	"gholms", -- automake 1.11 support
 	"juanelote", -- SongManager:GetSongGroupByIndex, JumpToNext/PrevGroup logic mods
 	"Kaox", -- pump/default noteskin
+	"Kyzentun",
+	"Mad Matt",
 	"NitroX72", -- pump/frame noteskin
 	"Petriform", -- default theme music
 	"桜為小鳩/Sakurana-Kobato (@sakuraponila)", -- custom scoring fixes
@@ -158,4 +161,4 @@ return Def.ActorFrame{
 	creditScroller..{
 		InitCommand=cmd(CenterX;y,SCREEN_BOTTOM-64),
 	}
-};
\ No newline at end of file
+};

From 8b93cae13d31e3f5bf1c623d7df0313ee987bb37 Mon Sep 17 00:00:00 2001
From: freem <aj187@ajworld.net>
Date: Mon, 1 Sep 2014 14:05:01 -0500
Subject: [PATCH 09/24] Remove non-working Export Packages for now; might add
 later if it works again

---
 Themes/_fallback/metrics.ini | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Themes/_fallback/metrics.ini b/Themes/_fallback/metrics.ini
index 2888cf0122..50299c88b9 100644
--- a/Themes/_fallback/metrics.ini
+++ b/Themes/_fallback/metrics.ini
@@ -3759,11 +3759,11 @@ Fallback="ScreenOptionsSimpleService"
 NextScreen=Branch.TitleMenu()
 PrevScreen=Branch.TitleMenu()
 
-LineNames="1,2,3,4"
+LineNames="1,2,3"
 Line1="gamecommand;screen,ScreenEditMenu;name,Edit Songs/Steps"
 Line2="gamecommand;screen,ScreenPracticeMenu;name,Practice Songs/Steps"
 Line3="gamecommand;screen,ScreenEditCourseModsMenu;name,Edit Courses/Mods"
-Line4="gamecommand;screen,ScreenOptionsExportPackage;name,Export Packages"
+#Line4="gamecommand;screen,ScreenOptionsExportPackage;name,Export Packages"
 
 # broken:
 # Line4="gamecommand;screen,ScreenOptionsManageCourses;name,Edit Courses"

From 46fac1fe8bd4172d7a85c901d9baf4f43ac71372 Mon Sep 17 00:00:00 2001
From: freem <aj187@ajworld.net>
Date: Mon, 1 Sep 2014 14:33:04 -0500
Subject: [PATCH 10/24] Update ScreenHowToPlay elements to use localized
 strings

---
 .../ScreenHowToPlay overlay/_howtoplay feet.lua          | 2 +-
 .../ScreenHowToPlay overlay/_howtoplay jump.lua          | 4 ++--
 .../ScreenHowToPlay overlay/_howtoplay miss.lua          | 4 ++--
 .../ScreenHowToPlay overlay/_howtoplay tap.lua           | 4 ++--
 Themes/default/Languages/en.ini                          | 9 ++++++++-
 5 files changed, 15 insertions(+), 8 deletions(-)

diff --git a/Themes/default/BGAnimations/ScreenHowToPlay overlay/_howtoplay feet.lua b/Themes/default/BGAnimations/ScreenHowToPlay overlay/_howtoplay feet.lua
index 72401b2ba2..15d333567f 100644
--- a/Themes/default/BGAnimations/ScreenHowToPlay overlay/_howtoplay feet.lua	
+++ b/Themes/default/BGAnimations/ScreenHowToPlay overlay/_howtoplay feet.lua	
@@ -1,5 +1,5 @@
 return LoadFont("Common Normal") .. {
-	Text="Your feet will be used to play!";
+	Text=ScreenString("Feet");
 	BeginCommand=function(self)
 		self:AddAttribute(5, {Length= 4, Diffuse=Color.Red})
 	end;
diff --git a/Themes/default/BGAnimations/ScreenHowToPlay overlay/_howtoplay jump.lua b/Themes/default/BGAnimations/ScreenHowToPlay overlay/_howtoplay jump.lua
index 046bccb804..e533b287f8 100644
--- a/Themes/default/BGAnimations/ScreenHowToPlay overlay/_howtoplay jump.lua	
+++ b/Themes/default/BGAnimations/ScreenHowToPlay overlay/_howtoplay jump.lua	
@@ -6,12 +6,12 @@ return Def.ActorFrame {
 		OnCommand=cmd(diffuse,color("#ffd400");shadowlength,1;zoomtowidth,192;fadeleft,0.25;faderight,0.25);
 	};
 	LoadFont("Common Bold") .. {
-		Text="Information";
+		Text=ScreenString("Information");
 		InitCommand=cmd(y,-26);
 		OnCommand=cmd(skewx,-0.125;diffuse,color("#ffd400");shadowlength,2;shadowcolor,BoostColor(color("#ffd40077"),0.25))
 	};
 	LoadFont("Common Normal") .. {
-		Text="Step on both panels if two different\narrows appear at the same time!.";
+		Text=ScreenString("Jump");
 		InitCommand=cmd(y,18;wrapwidthpixels,480;vertspacing,-12;shadowlength,1);
 		OnCommand=cmd(zoom,0.875);
 	};
diff --git a/Themes/default/BGAnimations/ScreenHowToPlay overlay/_howtoplay miss.lua b/Themes/default/BGAnimations/ScreenHowToPlay overlay/_howtoplay miss.lua
index b1aeb93ecf..f14b431b13 100644
--- a/Themes/default/BGAnimations/ScreenHowToPlay overlay/_howtoplay miss.lua	
+++ b/Themes/default/BGAnimations/ScreenHowToPlay overlay/_howtoplay miss.lua	
@@ -6,12 +6,12 @@ return Def.ActorFrame {
 		OnCommand=cmd(diffuse,color("#ffd400");shadowlength,1;zoomtowidth,192;fadeleft,0.25;faderight,0.25);
 	};
 	LoadFont("Common Bold") .. {
-		Text="Information";
+		Text=ScreenString("Information");
 		InitCommand=cmd(y,-26);
 		OnCommand=cmd(skewx,-0.125;diffuse,color("#ffd400");shadowlength,2;shadowcolor,BoostColor(color("#ffd40077"),0.25))
 	};
 	LoadFont("Common Normal") .. {
-		Text="If you misstep repeatedly, your dance\nguage will decrease until the game is\nis over!";
+		Text=ScreenString("Miss");
 		InitCommand=cmd(y,18;wrapwidthpixels,480;vertspacing,-12;shadowlength,1);
 		OnCommand=cmd(zoom,0.75);
 	};
diff --git a/Themes/default/BGAnimations/ScreenHowToPlay overlay/_howtoplay tap.lua b/Themes/default/BGAnimations/ScreenHowToPlay overlay/_howtoplay tap.lua
index d5f026270f..772f977bfb 100644
--- a/Themes/default/BGAnimations/ScreenHowToPlay overlay/_howtoplay tap.lua	
+++ b/Themes/default/BGAnimations/ScreenHowToPlay overlay/_howtoplay tap.lua	
@@ -6,12 +6,12 @@ return Def.ActorFrame {
 		OnCommand=cmd(diffuse,color("#ffd400");shadowlength,1;zoomtowidth,192;fadeleft,0.25;faderight,0.25);
 	};
 	LoadFont("Common Bold") .. {
-		Text="Information";
+		Text=ScreenString("Information");
 		InitCommand=cmd(y,-26);
 		OnCommand=cmd(skewx,-0.125;diffuse,color("#ffd400");shadowlength,2;shadowcolor,BoostColor(color("#ffd40077"),0.25))
 	};
 	LoadFont("Common Normal") .. {
-		Text="When the arrows rise to this point,\nstep on the matching panels.";
+		Text=ScreenString("Tap");
 		InitCommand=cmd(y,18;wrapwidthpixels,480;vertspacing,-12;shadowlength,1);
 		OnCommand=cmd(zoom,0.875);
 	};
diff --git a/Themes/default/Languages/en.ini b/Themes/default/Languages/en.ini
index 27badebb29..ed9b7f2368 100644
--- a/Themes/default/Languages/en.ini
+++ b/Themes/default/Languages/en.ini
@@ -1,4 +1,4 @@
-`[Screen]
+[Screen]
 HelpText=&BACK; Exit &START; Select &SELECT; Options &MENULEFT;&MENURIGHT;&MENUUP;&MENUDOWN; Move
 
 [ScreenWithMenuElements]
@@ -236,6 +236,13 @@ Play again soon!=Play again soon!
 
 [ScreenHowToPlay]
 How To Play StepMania=How To Play StepMania
+Information=Information
+
+Feet=Your feet will be used to play!
+Tap=When the arrows rise to this point,\nstep on the matching panels.
+Jump=Step on both panels if two different\narrows appear at the same time!
+Miss=If you misstep repeatedly, your dance\nguage will decrease until the game is\nis over!
+
 
 [Protiming]
 MS=MS

From aac32f81adcf2bffd85b6d4d7de7bc832e3c9640 Mon Sep 17 00:00:00 2001
From: Kyzentun <kyzentun@gmail.com>
Date: Mon, 1 Sep 2014 15:41:58 -0600
Subject: [PATCH 11/24] Rewrote ScreenCredits to move StepMania credits to
 Scripts/04 CreditsHelpers.lua and provide an API for adding sections so that
 themers don't have toe duplicate stepmania credits to theme the screen.

---
 .../BGAnimations/ScreenCredits overlay.lua    | 167 ++---------
 .../Graphics/CreditsLogo kyzentun.png         | Bin 0 -> 18775 bytes
 .../_fallback/Scripts/04 CreditsHelpers.lua   | 280 ++++++++++++++++++
 3 files changed, 310 insertions(+), 137 deletions(-)
 create mode 100755 Themes/_fallback/Graphics/CreditsLogo kyzentun.png
 create mode 100644 Themes/_fallback/Scripts/04 CreditsHelpers.lua

diff --git a/Themes/_fallback/BGAnimations/ScreenCredits overlay.lua b/Themes/_fallback/BGAnimations/ScreenCredits overlay.lua
index 8609c97488..845316d96c 100644
--- a/Themes/_fallback/BGAnimations/ScreenCredits overlay.lua	
+++ b/Themes/_fallback/BGAnimations/ScreenCredits overlay.lua	
@@ -1,156 +1,49 @@
-local function Fooled()
-	local phrases = {
-		"hornswaggled",
-		"bamboozled",
-		"hoodwinked",
-		"swindled",
-		"duped",
-		"hoaxed",
-		"fleeced",
-		"shafted",
-		"caboodled",
-		"beguiled",
-		"finagled",
-		"two-timed",
-		"suckered",
-		"flimflammed"
-	}
-	return phrases[math.random(#phrases)]
-end
+-- To add a section to the credits, use the following:
+-- local theme_credits= {
+-- 	name= "Theme Credits", -- the name of your section
+-- 	"Me", -- The people you want to list in your section.
+-- 	"Myself",
+-- 	"My other self",
+--  {logo= "pro_dude", name= "Pro self"}, -- Someone who has a logo image.
+--     -- This logo image would be "Graphics/CreditsLogo pro_dude.png".
+-- }
+-- StepManiaCredits.AddSection(theme_credits)
+--
+-- If you want to add your section after an existing section, use the following:
+-- StepManiaCredits.AddSection(theme_credits, 7)
+--
+-- Or position can be the name of a section to insert after:
+-- StepManiaCredits.AddSection(theme_credits, "Special Thanks")
+--
+-- Or if you want to add your section before a section:
+-- StepManiaCredits.AddSection(theme_credits, "Special Thanks", true)
 
-local ssc = {
-	"AJ Kelly as freem",
-	"Jonathan Payne (Midiman)",
-	"Colby Klein (shakesoda)",
-}
-
-local sm_ssc = {
-	"Jason Felds (wolfman2000)", -- Timing Segments, Split Timing, optimization
-	"Thai Pangsakulyanont (theDtTvB)", -- BMS, Split Timing, optimization
-	"Alberto Ramos (Daisuke Master)",
-	"Jack Walstrom (FSX)",
-}
-
-local stepmania = {
-	"Chris Danford",
-	"Glenn Maynard",
-	"Steve Checkoway",
-	-- and various other contributors
-}
-
-local oitg = {
-	"infamouspat",
-	"Mark Cannon (vyhd)",
-}
-
-local contrib = {
-	"Aldo Fregoso (Aldo_MX)", -- delays and much more. StepMania AMX creator
-	"A.C/@waiei", -- custom scoring fixes + Hybrid scoring
-	"cerbo", -- lua bindings and other fun stuff
-	"cesarmades", -- pump/cmd* noteskins
-	"Chris Eldridge (kurisu)", -- dance-threepanel stepstype support
-	"Christophe Goulet-LeBlanc (Kommisar)", -- songs
-	"corec", -- various fixes
-	"cybik", -- Android port
-	"galopin", -- piu PlayStation2 usb mat support
-	"gholms", -- automake 1.11 support
-	"juanelote", -- SongManager:GetSongGroupByIndex, JumpToNext/PrevGroup logic mods
-	"Kaox", -- pump/default noteskin
-	"Kyzentun",
-	"Mad Matt",
-	"NitroX72", -- pump/frame noteskin
-	"Petriform", -- default theme music
-	"桜為小鳩/Sakurana-Kobato (@sakuraponila)", -- custom scoring fixes
-	"Samuel Kim (1a2a3a2a1a)", -- various beat mode fixes
-	"hanubeki (@803832)", -- beginner helper fix, among various other things
-	"v1toko", -- x-mode from StepNXA
-	"Alfred Sorenson", -- new lua bindings
-}
-
-local translators = {
-	"John Reactor (Polish)",
-	"DHalens (Spanish)",
-	"@Niler_jp (Japanese)",
-	"Deamon007 (Dutch)"
-}
-
-local thanks = {
-	"A Pseudonymous Coder", -- support
-	"Bill Shillito (DM Ashura)", -- Music (not yet though)
-	"cpubasic13", -- testing (a lot)
-	"Dreamwoods",
-	"Jason Bolt (LightningXCE)",
-	"Jousway", -- Noteskins
-	"Luizsan", -- creator of Delta theme
-	"Matt1360", -- Automake magic + oitg bro
-	"Renard",
-	"Ryan McKanna (Plaguefox)",
-	"Sta Kousin", --help with Japanese bug reports
-}
-
-local shoutout = {
-	"The Lua team", -- lua project lead or some shit. super nerdy but oh hell.
-	"Mojang AB", -- minecraft forever -freem
-	"Wolfire Games", -- piles of inspiration
-	"NAKET Coder",
-	"Ciera Boyd", -- you bet your ass I'm putting my girlfriend in the credits
-	--Image(), -- we should have some logos probably to look super pro
-	"#KBO",
-	"Celestia Radio", -- LOVE AND TOLERANCE
-	"You showed us... your ultimate dance",
-}
-
-local copyright = {
-	"StepMania is released under the terms of the MIT license.",
-	"If you paid for the program you've been " .. Fooled() .. ".",
-	"All content is the sole property of their respectful owners."
-}
-
-local sections = {
-	{ "the spinal shark collective (project lead)", ssc },
-	{ "sm-ssc Team", sm_ssc },
-	{ "StepMania Team", stepmania },
-	{ "OpenITG Team", oitg },
-	{ "Translators", translators },
-	{ "Other Contributors", contrib },
-	{ "Special Thanks", thanks },
-	{ "Shoutouts", shoutout },
-	{ "Copyright", copyright },
-}
-
--- To add people or sections modify the above.
+-- StepManiaCredits is defined in _fallback/Scripts/04 CreditsHelpers.lua.
 
 local lineOn = cmd(zoom,0.875;strokecolor,color("#444444");shadowcolor,color("#444444");shadowlength,3)
 local sectionOn = cmd(diffuse,color("#88DDFF");strokecolor,color("#446688");shadowcolor,color("#446688");shadowlength,3)
 local item_padding_start = 4;
+local line_height= 30
+-- Tell the credits table the line height so it can use it for logo sizing.
+StepManiaCredits.SetLineHeight(line_height)
 
 local creditScroller = Def.ActorScroller {
 	SecondsPerItem = 0.5;
 	NumItemsToDraw = 40;
 	TransformFunction = function( self, offset, itemIndex, numItems)
-		self:y(30*offset)
+		self:y(line_height*offset)
 	end;
 	OnCommand = cmd(scrollwithpadding,item_padding_start,15);
 }
 
-local function AddLine( text, command )
-	local text = Def.ActorFrame{
-		LoadFont("Common normal")..{
-			Text = text or "";
-			OnCommand = command or lineOn;
-		}
-	}
-	table.insert( creditScroller, text )
-end
-
 -- Add sections with padding.
-for section in ivalues(sections) do
-	AddLine( section[1], sectionOn )
-	for name in ivalues(section[2]) do
-		AddLine( name )
+for section in ivalues(StepManiaCredits.Get()) do
+	StepManiaCredits.AddLineToScroller(creditScroller, section.name, sectionOn)
+	for name in ivalues(section) do
+		StepManiaCredits.AddLineToScroller(creditScroller, name)
 	end
-	AddLine()
-	AddLine()
+	StepManiaCredits.AddLineToScroller(creditScroller)
+	StepManiaCredits.AddLineToScroller(creditScroller)
 end
 
 creditScroller.BeginCommand=function(self)
diff --git a/Themes/_fallback/Graphics/CreditsLogo kyzentun.png b/Themes/_fallback/Graphics/CreditsLogo kyzentun.png
new file mode 100755
index 0000000000000000000000000000000000000000..d9431bc99df22e1d2d098e6972fb34c9dd414324
GIT binary patch
literal 18775
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
S5;3g+0000<MNUMnLSTX=YgLN?

literal 0
HcmV?d00001

diff --git a/Themes/_fallback/Scripts/04 CreditsHelpers.lua b/Themes/_fallback/Scripts/04 CreditsHelpers.lua
new file mode 100644
index 0000000000..4bd43fe955
--- /dev/null
+++ b/Themes/_fallback/Scripts/04 CreditsHelpers.lua	
@@ -0,0 +1,280 @@
+local function Fooled()
+	local phrases = {
+		"hornswaggled",
+		"bamboozled",
+		"hoodwinked",
+		"swindled",
+		"duped",
+		"hoaxed",
+		"fleeced",
+		"shafted",
+		"caboodled",
+		"beguiled",
+		"finagled",
+		"two-timed",
+		"suckered",
+		"flimflammed",
+		"generous"
+	}
+	return phrases[math.random(#phrases)]
+end
+
+local line_height= 30 -- so that actor logos can use it.
+
+local stepmania_credits= {
+	{
+		name= "the spinal shark collective (project lead)",
+		"AJ Kelly as freem",
+		"Jonathan Payne (Midiman)",
+		"Colby Klein (shakesoda)",
+	},
+	{
+		name= "sm-ssc Team",
+		"Jason Felds (wolfman2000)", -- Timing Segments, Split Timing, optimization
+		"Thai Pangsakulyanont (theDtTvB)", -- BMS, Split Timing, optimization
+		"Alberto Ramos (Daisuke Master)",
+		"Jack Walstrom (FSX)",
+	},
+	{
+		name= "StepMania Team",
+		"Chris Danford",
+		"Glenn Maynard",
+		"Steve Checkoway",
+		-- and various other contributors
+	},
+	{
+		name= "OpenITG Team",
+		"infamouspat",
+		"Mark Cannon (vyhd)",
+	},
+	{
+		name= "Translators",
+		"John Reactor (Polish)",
+		"DHalens (Spanish)",
+		"@Niler_jp (Japanese)",
+		"Deamon007 (Dutch)"
+	},
+	{
+		name= "Other Contributors",
+		"Aldo Fregoso (Aldo_MX)", -- delays and much more. StepMania AMX creator
+		"A.C/@waiei", -- custom scoring fixes + Hybrid scoring
+		"cerbo", -- lua bindings and other fun stuff
+		"cesarmades", -- pump/cmd* noteskins
+		"Chris Eldridge (kurisu)", -- dance-threepanel stepstype support
+		"Christophe Goulet-LeBlanc (Kommisar)", -- songs
+		"corec", -- various fixes
+		"cybik", -- Android port
+		"galopin", -- piu PlayStation2 usb mat support
+		"gholms", -- automake 1.11 support
+		"juanelote", -- SongManager:GetSongGroupByIndex, JumpToNext/PrevGroup logic mods
+		"Kaox", -- pump/default noteskin
+		-- Add Graphics/CreditsLogo name.png and change your entry to a table like this to look super pro.
+		{logo= "kyzentun", name= "Kyzentun"}, -- new lua bindings
+		"Mad Matt", -- new lua bindings
+		"NitroX72", -- pump/frame noteskin
+		"Petriform", -- default theme music
+		"桜為小鳩/Sakurana-Kobato (@sakuraponila)", -- custom scoring fixes
+		"Samuel Kim (1a2a3a2a1a)", -- various beat mode fixes
+		"hanubeki (@803832)", -- beginner helper fix, among various other things
+		"v1toko", -- x-mode from StepNXA
+		"Alfred Sorenson", -- new lua bindings
+	},
+	{
+		name= "Special Thanks",
+		"A Pseudonymous Coder", -- support
+		"Bill Shillito (DM Ashura)", -- Music (not yet though)
+		"cpubasic13", -- testing (a lot)
+		"dbk2", -- mac builds, a couple actor behavior fixes
+		"Dreamwoods",
+		"Jason Bolt (LightningXCE)",
+		"Jousway", -- Noteskins
+		"Luizsan", -- creator of Delta theme
+		"Matt1360", -- Automake magic + oitg bro
+		"Renard",
+		"Ryan McKanna (Plaguefox)",
+		"Sta Kousin", --help with Japanese bug reports
+	},
+	{
+		name= "Shoutouts",
+		"The Lua team", -- lua project lead or some shit. super nerdy but oh hell.
+		"Mojang AB", -- minecraft forever -freem
+		"Wolfire Games", -- piles of inspiration
+		"NAKET Coder",
+		"Ciera Boyd", -- you bet your ass I'm putting my girlfriend in the credits -shakesoda
+		"#KBO",
+		"Celestia Radio", -- LOVE AND TOLERANCE
+		"You showed us... your ultimate dance",
+	},
+}
+
+local kyzentuns_fancy_value= 16
+
+local special_logos= {
+	kyzentun= Def.ActorMultiVertex{
+		Texture= THEME:GetPathG("CreditsLogo", "kyzentun"),
+		OnCommand= function(self)
+			self:SetDrawState{Mode= "DrawMode_Quads"}
+			kyzentuns_fancy_value= math.random(2, 32)
+			self:playcommand("fancy", {state= 0})
+			self:queuecommand("normal_state")
+		end,
+		fancyCommand= function(self, params)
+			local verts= {}
+			local rlh= line_height - 2
+			local sx= rlh * -1
+			local sy= rlh * -.5
+			local sp= rlh / kyzentuns_fancy_value
+			local spt= 1 / kyzentuns_fancy_value
+			local c= color("#ffffff")
+			for x= 1, kyzentuns_fancy_value do
+				local lx= sx + (sp * (x-1))
+				local rx= sx + (sp * x)
+				local ltx= spt * (x-1)
+				local rtx= spt * x
+				for y= 1, kyzentuns_fancy_value do
+					local ty= sy + (sp * (y-1))
+					local by= sy + (sp * y)
+					local tty= spt * (y-1)
+					local bty= spt * y
+					if params.state == 1 then
+						ltx= 0
+						rtx= 1
+						tty= 0
+						bty= 1
+					end
+					verts[#verts+1]= {{lx, ty, 0}, {ltx, tty}, c}
+					verts[#verts+1]= {{rx, ty, 0}, {rtx, tty}, c}
+					verts[#verts+1]= {{rx, by, 0}, {rtx, bty}, c}
+					verts[#verts+1]= {{lx, by, 0}, {ltx, bty}, c}
+				end
+			end
+			self:SetVertices(verts)
+		end,
+		normal_stateCommand= function(self)
+			self:linear(1)
+			self:playcommand("fancy", {state= 0})
+			self:queuecommand("split_state")
+		end,
+		split_stateCommand= function(self)
+			self:linear(1)
+			self:playcommand("fancy", {state= 1})
+			self:queuecommand("normal_state")
+		end,
+	},
+}
+
+-- Go through the credits and swap in the special logos.
+for section in ivalues(stepmania_credits) do
+	for entry in ivalues(section) do
+		if type(entry) == "table" and special_logos[entry.logo] then
+			entry.logo= special_logos[entry.logo]
+		end
+	end
+end
+
+local function position_logo(self)
+	local name= self:GetParent():GetChild("name")
+	local name_width= name:GetZoomedWidth()
+	local logo_width= self:GetZoomedWidth()
+	self:x(0 - (name_width / 2) - 4 - (logo_width / 2))
+end
+
+StepManiaCredits= {
+	AddSection= function(section, pos, insert_before)
+		if not section.name then
+			lua.ReportScriptError("A section being added to the credits must have a name field.")
+			return
+		end
+		if #section < 1 then
+			lua.ReportScriptError("Adding a blank section to the credits doesn't make sense.")
+			return
+		end
+		if type(pos) == "string" then
+			for i, section in ipairs(stepmania_credits) do
+				if section.name == pos then
+					pos= i -- insert_after is default behavior
+				end
+			end
+		end
+		if pos and type(pos) ~= "number" then
+			lua.ReportScriptError("Credits section '" .. tostring(pos) .. " not found, cannot use position to add new section.")
+			return
+		end
+		pos= pos or #stepmania_credits
+		if insert_before then
+			pos= pos - 1
+		end
+		-- table.insert does funny things if you pass an index <= 0
+		if pos < 1 then
+			lua.ReportScriptError("Cannot add credits section at position " .. tostring(pos) .. ".")
+			return
+		end
+		table.insert(stepmania_credits, pos, section)
+	end,
+	AddLineToScroller= function(scroller, text, command)
+		if type(scroller) ~= "table" then
+			lua.ReportScriptError("scroller passed to AddLineToScroller must be an actor table.")
+			return
+		end
+		local actor_to_insert
+		if type(text) == "string" or not text then
+			actor_to_insert= Def.ActorFrame{
+				Def.BitmapText{
+					Font= "Common Normal",
+					Text = text or "";
+					OnCommand = command or lineOn;
+				}
+			}
+		elseif type(text) == "table" then
+			actor_to_insert= Def.ActorFrame{
+				Def.BitmapText{
+					Name= "name", Font= "Common Normal",
+					Text = text.name or "",
+					InitCommand = command or lineOn,
+				},
+			}
+			if text.logo then
+				if type(text.logo) == "string" then
+					actor_to_insert[#actor_to_insert+1]= Def.Sprite{
+						Name= "logo",
+						InitCommand= function(self)
+							-- Use LoadBanner to disable the odd dimension warning.
+							self:LoadBanner(THEME:GetPathG("CreditsLogo", text.logo))
+							-- Scale to slightly less than the line height for padding.
+							local yscale= (line_height-2) / self:GetHeight()
+							self:zoom(yscale)
+							-- Position logo to the left of the name.
+							position_logo(self)
+						end
+					}
+				else -- assume logo is an actor
+					-- Insert positioning InitCommand.
+					text.logo.InitCommand= position_logo
+					actor_to_insert[#actor_to_insert+1]= text.logo
+				end
+			end
+		end
+		table.insert(scroller, actor_to_insert)
+	end,
+	Get= function()
+		-- Copy the base credits and add the copyright message at the end.
+		local ret= DeepCopy(stepmania_credits)
+		ret[#ret+1]= StepManiaCredits.RandomCopyrightMessage()
+		return ret
+	end,
+	RandomCopyrightMessage= function()
+		return {
+			name= "Copyright",
+			"StepMania is released under the terms of the MIT license.",
+			"If you paid for the program you've been " .. Fooled() .. ".",
+			"All content is the sole property of their respectful owners."
+		}
+	end,
+	SetLineHeight= function(height)
+		if type(height) ~= "number" then
+			lua.ReportScriptError("height passed to StepManiaCredits.SetLineHeight must be a number.")
+			return
+		end
+		line_height= height
+	end
+}

From eae5fcb3ba5701255083cc6745a76c4e618d443c Mon Sep 17 00:00:00 2001
From: Dan Guzek <dguzek@gmail.com>
Date: Mon, 1 Sep 2014 19:00:00 -0400
Subject: [PATCH 12/24] expose InsertCoin and InsertCredit to Lua

This commit exposes InsertCoin() and InsertCredit() to Lua under GAMESTATE.  It adds a check to ensure overall credits don't become negative when deducting and only plays sounds if credits are being added.

Themers are instructed to deduct credits by passing negative values to InsertCoin.
---
 Docs/Luadoc/Lua.xml              |  2 +
 Docs/Luadoc/LuaDocumentation.xml |  7 +++
 src/GameState.cpp                | 38 +++++++++-----
 src/StepMania.cpp                | 88 +++++++++++++++++---------------
 4 files changed, 82 insertions(+), 53 deletions(-)

diff --git a/Docs/Luadoc/Lua.xml b/Docs/Luadoc/Lua.xml
index 3e9d5c4669..cca7e62894 100644
--- a/Docs/Luadoc/Lua.xml
+++ b/Docs/Luadoc/Lua.xml
@@ -810,6 +810,8 @@
 			<Function name='HasEarnedExtraStage'/>
 			<Function name='HaveProfileToLoad'/>
 			<Function name='HaveProfileToSave'/>
+			<Function name='InsertCoin'/>
+			<Function name='InsertCredit'/>
 			<Function name='InStepEditor'/>
 			<Function name='IsAnExtraStage'/>
 			<Function name='IsAnyHumanPlayerUsingMemoryCard'/>
diff --git a/Docs/Luadoc/LuaDocumentation.xml b/Docs/Luadoc/LuaDocumentation.xml
index b0ad156762..4dbeb7bbc1 100644
--- a/Docs/Luadoc/LuaDocumentation.xml
+++ b/Docs/Luadoc/LuaDocumentation.xml
@@ -2478,6 +2478,13 @@ save yourself some time, copy this for undocumented things:
 		editing portion. If in recording or playing mode, this will return
 		<code>false</code>.
 	</Function>
+	<Function name='InsertCoin' return='void' arguments='int iCoins'>
+		Inserts <code>iCoins</code> number of coins.  <code>iCoins</code> can be negative or positive.
+	</Function>
+	<Function name='InsertCredit' return='void' arguments=''>
+		Inserts one credit.  To deduct a credit, pass a negative integer representing the number
+		of coins per credit to <Link class='GameState' function='InsertCoin'>InsertCoin</Link>.
+	</Function>
 	<Function name='IsAnExtraStage' return='bool' arguments=''>
 		Returns <code>true</code> if this is an extra stage.
 	</Function>
diff --git a/src/GameState.cpp b/src/GameState.cpp
index fd2c05eb0d..a316a2e3e0 100644
--- a/src/GameState.cpp
+++ b/src/GameState.cpp
@@ -32,6 +32,7 @@
 #include "SongManager.h"
 #include "SongUtil.h"
 #include "StatsManager.h"
+#include "StepMania.h"
 #include "Steps.h"
 #include "Style.h"
 #include "ThemeManager.h"
@@ -396,7 +397,7 @@ void GameState::JoinPlayer( PlayerNumber pn )
 		// dance-threepanel, popn-nine). -aj
 		// XXX?: still shows joined player as "Insert Card". May not be an issue? -aj
 		if( m_pCurStyle->m_StyleType == StyleType_OnePlayerTwoSides ||
-			m_pCurStyle->m_StepsType == StepsType_dance_solo || 
+			m_pCurStyle->m_StepsType == StepsType_dance_solo ||
 			m_pCurStyle->m_StepsType == StepsType_dance_threepanel ||
 			m_pCurStyle->m_StepsType == StepsType_popn_nine )
 			pStyle = GAMEMAN->GetFirstCompatibleStyle( m_pCurGame, 1, m_pCurStyle->m_StepsType );
@@ -2221,7 +2222,7 @@ MultiPlayer GetNextEnabledMultiPlayer( MultiPlayer mp )
 #include "LuaBinding.h"
 #include "Game.h"
 
-/** @brief Allow Lua to have access to the GameState. */ 
+/** @brief Allow Lua to have access to the GameState. */
 class LunaGameState: public Luna<GameState>
 {
 public:
@@ -2531,7 +2532,7 @@ public:
 			vEP.push_back( pn );
 		LuaHelpers::CreateTableFromArray( vEP, L );
 		return 1;
-	}  
+	}
 	static int GetCurrentStyle( T* p, lua_State *L )
 	{
 		Style *pStyle = const_cast<Style *> (p->GetCurrentStyle());
@@ -2550,9 +2551,9 @@ public:
 		return 1;
 	}
 	static int GetNumStagesForCurrentSongAndStepsOrCourse( T* , lua_State *L )
-	{ 
+	{
 		lua_pushnumber(L, GAMESTATE->GetNumStagesForCurrentSongAndStepsOrCourse() );
-		return 1; 
+		return 1;
 	}
 	static int GetNumStagesLeft( T* p, lua_State *L )
 	{
@@ -2589,20 +2590,29 @@ public:
 	}
 	static int GetExpandedSectionName( T* p, lua_State *L )				{ lua_pushstring(L, p->sExpandedSectionName); return 1; }
 	static int AddStageToPlayer( T* p, lua_State *L )				{ p->AddStageToPlayer(Enum::Check<PlayerNumber>(L, 1)); return 0; }
+	static int InsertCoin( T* p, lua_State *L )
+	{
+		int numCoins = lua_tointeger(L, 1);
+		StepMania::InsertCoin(numCoins, false);
+	}
+	static int InsertCredit( T* p, lua_State *L )
+	{
+		StepMania::InsertCredit();
+	}
 	static int CurrentOptionsDisqualifyPlayer( T* p, lua_State *L )	{ lua_pushboolean(L, p->CurrentOptionsDisqualifyPlayer(Enum::Check<PlayerNumber>(L, 1))); return 1; }
-	
+
 	static int ResetPlayerOptions( T* p, lua_State *L )
 	{
 		p->ResetPlayerOptions(Enum::Check<PlayerNumber>(L, 1));
 		return 0;
 	}
-	
+
 	static int RefreshNoteSkinData( T* p, lua_State *L )
 	{
 		NOTESKIN->RefreshNoteSkinData(p->m_pCurGame);
 		return 0;
 	}
-	
+
 	static int Dopefish( T* p, lua_State *L )
 	{
 		lua_pushboolean(L, p->m_bDopefish);
@@ -2620,7 +2630,7 @@ public:
 		SCREENMAN->ZeroNextUpdate();
 		return 0;
 	}
-	
+
 	static int SaveProfiles( T* p, lua_State *L )
 	{
 		p->SavePlayerProfiles();
@@ -2702,22 +2712,22 @@ public:
 		}
 
 		StyleType st = pStyle->m_StyleType;
-		if( p->GetNumSidesJoined() == 2 && 
+		if( p->GetNumSidesJoined() == 2 &&
 			( st == StyleType_OnePlayerOneSide || st == StyleType_OnePlayerTwoSides ) )
 		{
 			luaL_error( L, "Too many sides joined for style %s", pStyle->m_szName );
 		}
-		else if( p->GetNumSidesJoined() == 1 && 
+		else if( p->GetNumSidesJoined() == 1 &&
 			( st == StyleType_TwoPlayersTwoSides || st == StyleType_TwoPlayersSharedSides ) )
 		{
 			luaL_error( L, "Too few sides joined for style %s", pStyle->m_szName );
 		}
 
 		if( !AreStyleAndPlayModeCompatible( p, L, pStyle, p->m_PlayMode ) )
-		{ 
+		{
 			return 0;
 		}
-	
+
 		p->SetCurrentStyle( pStyle );
 		ClearIncompatibleStepsAndTrails( p, L );
 
@@ -2841,6 +2851,8 @@ public:
 		ADD_METHOD( SetCharacter );
 		ADD_METHOD( GetExpandedSectionName );
 		ADD_METHOD( AddStageToPlayer );
+		ADD_METHOD( InsertCoin );
+		ADD_METHOD( InsertCredit );
 		ADD_METHOD( CurrentOptionsDisqualifyPlayer );
 		ADD_METHOD( ResetPlayerOptions );
 		ADD_METHOD( RefreshNoteSkinData );
diff --git a/src/StepMania.cpp b/src/StepMania.cpp
index a53766ea32..5271066b47 100644
--- a/src/StepMania.cpp
+++ b/src/StepMania.cpp
@@ -124,10 +124,10 @@ static RString GetActualGraphicOptionsString()
 	RString sLog = ssprintf( sFormat,
 		DISPLAY->GetApiDescription().c_str(),
 		(params.windowed? WINDOWED : FULLSCREEN).GetValue().c_str(),
-		(int)params.width, 
-		(int)params.height, 
-		(int)params.bpp, 
-		(int)PREFSMAN->m_iTextureColorDepth, 
+		(int)params.width,
+		(int)params.height,
+		(int)params.bpp,
+		(int)PREFSMAN->m_iTextureColorDepth,
 		(int)params.rate,
 		(params.vsync? VSYNC : NO_VSYNC).GetValue().c_str(),
 		(PREFSMAN->m_bSmoothLines? SMOOTH_LINES : NO_SMOOTH_LINES).GetValue().c_str() );
@@ -142,7 +142,7 @@ static void StoreActualGraphicOptions()
 	const VideoModeParams &params = DISPLAY->GetActualVideoModeParams();
 	PREFSMAN->m_bWindowed.Set( params.windowed );
 
-	/* If we're windowed, we may have tweaked the width based on the aspect ratio.  
+	/* If we're windowed, we may have tweaked the width based on the aspect ratio.
 	 * Don't save this new value over the preferred value. */
 	if( !PREFSMAN->m_bWindowed )
 	{
@@ -184,17 +184,17 @@ static void StartDisplay()
 	DISPLAY = CreateDisplay();
 
 	DISPLAY->ChangeCentering(
-		PREFSMAN->m_iCenterImageTranslateX, 
+		PREFSMAN->m_iCenterImageTranslateX,
 		PREFSMAN->m_iCenterImageTranslateY,
 		PREFSMAN->m_fCenterImageAddWidth,
 		PREFSMAN->m_fCenterImageAddHeight );
 
 	TEXTUREMAN	= new RageTextureManager;
-	TEXTUREMAN->SetPrefs( 
-		RageTextureManagerPrefs( 
-			PREFSMAN->m_iTextureColorDepth, 
+	TEXTUREMAN->SetPrefs(
+		RageTextureManagerPrefs(
+			PREFSMAN->m_iTextureColorDepth,
 			PREFSMAN->m_iMovieColorDepth,
-			PREFSMAN->m_bDelayedTextureDelete, 
+			PREFSMAN->m_bDelayedTextureDelete,
 			PREFSMAN->m_iMaxTextureResolution,
 			StepMania::GetHighResolutionTextures(),
 			PREFSMAN->m_bForceMipMaps
@@ -202,15 +202,15 @@ static void StartDisplay()
 		);
 
 	MODELMAN	= new ModelManager;
-	MODELMAN->SetPrefs( 
+	MODELMAN->SetPrefs(
 		ModelManagerPrefs(
-			PREFSMAN->m_bDelayedModelDelete 
+			PREFSMAN->m_bDelayedModelDelete
 			)
 		);
 }
 
 void StepMania::ApplyGraphicOptions()
-{ 
+{
 	bool bNeedReload = false;
 
 	VideoModeParams params;
@@ -220,25 +220,25 @@ void StepMania::ApplyGraphicOptions()
 		RageException::Throw( "%s", sError.c_str() );
 
 	DISPLAY->ChangeCentering(
-		PREFSMAN->m_iCenterImageTranslateX, 
+		PREFSMAN->m_iCenterImageTranslateX,
 		PREFSMAN->m_iCenterImageTranslateY,
 		PREFSMAN->m_fCenterImageAddWidth,
 		PREFSMAN->m_fCenterImageAddHeight );
 
-	bNeedReload |= TEXTUREMAN->SetPrefs( 
-		RageTextureManagerPrefs( 
-			PREFSMAN->m_iTextureColorDepth, 
+	bNeedReload |= TEXTUREMAN->SetPrefs(
+		RageTextureManagerPrefs(
+			PREFSMAN->m_iTextureColorDepth,
 			PREFSMAN->m_iMovieColorDepth,
-			PREFSMAN->m_bDelayedTextureDelete, 
+			PREFSMAN->m_bDelayedTextureDelete,
 			PREFSMAN->m_iMaxTextureResolution,
 			StepMania::GetHighResolutionTextures(),
 			PREFSMAN->m_bForceMipMaps
 			)
 		);
 
-	bNeedReload |= MODELMAN->SetPrefs( 
+	bNeedReload |= MODELMAN->SetPrefs(
 		ModelManagerPrefs(
-			PREFSMAN->m_bDelayedModelDelete 
+			PREFSMAN->m_bDelayedModelDelete
 			)
 		);
 
@@ -371,14 +371,14 @@ static void AdjustForChangedSystemCapabilities()
 
 	if( g_iLastSeenMemory == Memory )
 		return;
-	
+
 	LOG->Trace( "Memory changed from %i to %i; settings changed", g_iLastSeenMemory.Get(), Memory );
 	g_iLastSeenMemory.Set( Memory );
 
 	// is this assumption outdated? -aj
 	/* Let's consider 128-meg systems low-memory, and 256-meg systems high-memory.
 	 * Cut off at 192. This is pretty conservative; many 128-meg systems can
-	 * deal with higher memory profile settings, but some can't. 
+	 * deal with higher memory profile settings, but some can't.
 	 *
 	 * Actually, Windows lops off a meg or two; cut off a little lower to treat
 	 * 192-meg systems as high-memory. */
@@ -452,7 +452,7 @@ struct VideoCardDefaults
 		iTextureSize = iTextureSize_;
 		bSmoothLines = bSmoothLines_;
 	}
-} const g_VideoCardDefaults[] = 
+} const g_VideoCardDefaults[] =
 {
 	VideoCardDefaults(
 		"Voodoo *5",
@@ -505,7 +505,7 @@ struct VideoCardDefaults
 	VideoCardDefaults(
 		"Savage",
 		"d3d",
-			// OpenGL is unusable on my Savage IV with even the latest drivers.  
+			// OpenGL is unusable on my Savage IV with even the latest drivers.
 			// It draws 30 frames of gibberish then crashes. This happens even with
 			// simple NeHe demos. -Chris
 		640,480,
@@ -516,8 +516,8 @@ struct VideoCardDefaults
 	VideoCardDefaults(
 		"XPERT@PLAY|IIC|RAGE PRO|RAGE LT PRO",	// Rage Pro chip, Rage IIC chip
 		"d3d",
-			// OpenGL is not hardware accelerated, despite the fact that the 
-			// drivers come with an ICD.  Also, the WinXP driver performance 
+			// OpenGL is not hardware accelerated, despite the fact that the
+			// drivers come with an ICD.  Also, the WinXP driver performance
 			// is terrible and supports only 640. The ATI driver is usable.
 			// -Chris
 		320,240,	// lower resolution for 60fps. In-box WinXP driver doesn't support 400x300.
@@ -651,7 +651,7 @@ bool CheckVideoDefaultSettings()
 		bSetDefaultVideoParams = true;
 		LOG->Trace( "Applying defaults for %s.", sVideoDriver.c_str() );
 	}
-	else if( PREFSMAN->m_sLastSeenVideoDriver.Get() != sVideoDriver ) 
+	else if( PREFSMAN->m_sLastSeenVideoDriver.Get() != sVideoDriver )
 	{
 		bSetDefaultVideoParams = true;
 		LOG->Trace( "Video card has changed from %s to %s.  Applying new defaults.", PREFSMAN->m_sLastSeenVideoDriver.Get().c_str(), sVideoDriver.c_str() );
@@ -723,7 +723,7 @@ RageDisplay *CreateDisplay()
 	VideoModeParams params;
 	StepMania::GetPreferredVideoModeParams( params );
 
-	RString error = ERROR_INITIALIZING_CARD.GetValue()+"\n\n"+ 
+	RString error = ERROR_INITIALIZING_CARD.GetValue()+"\n\n"+
 		ERROR_DONT_FILE_BUG.GetValue()+"\n\n"
 		VIDEO_TROUBLESHOOTING_URL "\n\n"+
 		ssprintf(ERROR_VIDEO_DRIVER.GetValue(), GetVideoDriverName().c_str())+"\n\n";
@@ -954,11 +954,11 @@ int main(int argc, char* argv[])
 	// Almost everything uses this to read and write files.  Load this early.
 	FILEMAN = new RageFileManager( argv[0] );
 	FILEMAN->MountInitialFilesystems();
-	
+
 	bool bPortable = DoesFileExist("Portable.ini");
 	if( !bPortable )
 		FILEMAN->MountUserFilesystems();
-	
+
 	// Set this up next. Do this early, since it's needed for RageException::Throw.
 	LOG		= new RageLog;
 
@@ -1240,7 +1240,10 @@ void StepMania::InsertCoin( int iNum, bool bCountInBookkeeping )
 		BOOKKEEPER->CoinInserted();
 	}
 	int iNumCoinsOld = GAMESTATE->m_iCoins;
-	GAMESTATE->m_iCoins.Set( GAMESTATE->m_iCoins + iNum );
+
+	// Don't allow GAMESTATE's coin count to become negative.
+	if (GAMESTATE->m_iCoins + iNum >= 0)
+		GAMESTATE->m_iCoins.Set( GAMESTATE->m_iCoins + iNum );
 
 	int iCredits = GAMESTATE->m_iCoins / PREFSMAN->m_iCoinsPerCredit;
 	bool bMaxCredits = iCredits >= MAX_NUM_CREDITS;
@@ -1248,10 +1251,15 @@ void StepMania::InsertCoin( int iNum, bool bCountInBookkeeping )
 		GAMESTATE->m_iCoins.Set( MAX_NUM_CREDITS * PREFSMAN->m_iCoinsPerCredit );
 
 	LOG->Trace("%i coins inserted, %i needed to play", GAMESTATE->m_iCoins.Get(), PREFSMAN->m_iCoinsPerCredit.Get() );
-	if( iNumCoinsOld != GAMESTATE->m_iCoins )
-		SCREENMAN->PlayCoinSound();
-	else
-		SCREENMAN->PlayInvalidSound();
+
+	// If inserting coins, play the appropriate sound; if deducting coins, don't.
+	if (iNum > 0)
+	{
+		if( iNumCoinsOld != GAMESTATE->m_iCoins )
+			SCREENMAN->PlayCoinSound();
+		else
+			SCREENMAN->PlayInvalidSound();
+	}
 
 	/* If AutoJoin and a player is already joined, then try to join a player.
 	 * (If no players are joined, they'll join on the first JoinInput.) */
@@ -1299,7 +1307,7 @@ static LocalizedString RELOADED_OVERLAY_SCREENS( "ThemeManager", "Reloaded overl
 bool HandleGlobalInputs( const InputEventPlus &input )
 {
 	// None of the globals keys act on types other than FIRST_PRESS
-	if( input.type != IET_FIRST_PRESS ) 
+	if( input.type != IET_FIRST_PRESS )
 		return false;
 
 	switch( input.MenuI )
@@ -1403,21 +1411,21 @@ bool HandleGlobalInputs( const InputEventPlus &input )
 	}
 #endif
 
-	bool bDoScreenshot = 
+	bool bDoScreenshot =
 #if defined(MACOSX)
 	// Notebooks don't have F13. Use cmd-F12 as well.
 		input.DeviceI == DeviceInput( DEVICE_KEYBOARD, KEY_PRTSC ) ||
 		input.DeviceI == DeviceInput( DEVICE_KEYBOARD, KEY_F13 ) ||
-		( input.DeviceI == DeviceInput(DEVICE_KEYBOARD, KEY_F12) && 
+		( input.DeviceI == DeviceInput(DEVICE_KEYBOARD, KEY_F12) &&
 		  (INPUTFILTER->IsBeingPressed(DeviceInput(DEVICE_KEYBOARD, KEY_LMETA), &input.InputList) ||
 		   INPUTFILTER->IsBeingPressed(DeviceInput(DEVICE_KEYBOARD, KEY_RMETA), &input.InputList)) );
 #else
 	/* The default Windows message handler will capture the desktop window upon
 	 * pressing PrntScrn, or will capture the foreground with focus upon pressing
-	 * Alt+PrntScrn. Windows will do this whether or not we save a screenshot 
+	 * Alt+PrntScrn. Windows will do this whether or not we save a screenshot
 	 * ourself by dumping the frame buffer. */
 	// "if pressing PrintScreen and not pressing Alt"
-		input.DeviceI == DeviceInput(DEVICE_KEYBOARD, KEY_PRTSC) && 
+		input.DeviceI == DeviceInput(DEVICE_KEYBOARD, KEY_PRTSC) &&
 		!INPUTFILTER->IsBeingPressed(DeviceInput(DEVICE_KEYBOARD, KEY_LALT), &input.InputList) &&
 		!INPUTFILTER->IsBeingPressed(DeviceInput(DEVICE_KEYBOARD, KEY_RALT), &input.InputList);
 #endif

From 6ccbbb4f6f4b1d2b95ee1649251c8f18714287e8 Mon Sep 17 00:00:00 2001
From: Dan Guzek <dguzek@gmail.com>
Date: Mon, 1 Sep 2014 20:03:45 -0400
Subject: [PATCH 13/24] update InsertCoin and InsertCredit functions

These should now agree with kyzentun's suggestions.
---
 src/GameState.cpp | 8 ++++++--
 src/StepMania.cpp | 2 +-
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/src/GameState.cpp b/src/GameState.cpp
index a316a2e3e0..b75952fe33 100644
--- a/src/GameState.cpp
+++ b/src/GameState.cpp
@@ -2592,8 +2592,12 @@ public:
 	static int AddStageToPlayer( T* p, lua_State *L )				{ p->AddStageToPlayer(Enum::Check<PlayerNumber>(L, 1)); return 0; }
 	static int InsertCoin( T* p, lua_State *L )
 	{
-		int numCoins = lua_tointeger(L, 1);
-		StepMania::InsertCoin(numCoins, false);
+		int numCoins = IArg(1);
+		if (GAMESTATE->m_iCoins + numCoins >= 0)
+			StepMania::InsertCoin(numCoins, false);
+		else
+			luaL_error( L, "Credits may not be negative." );
+
 	}
 	static int InsertCredit( T* p, lua_State *L )
 	{
diff --git a/src/StepMania.cpp b/src/StepMania.cpp
index 5271066b47..f0494f7dcc 100644
--- a/src/StepMania.cpp
+++ b/src/StepMania.cpp
@@ -1252,7 +1252,7 @@ void StepMania::InsertCoin( int iNum, bool bCountInBookkeeping )
 
 	LOG->Trace("%i coins inserted, %i needed to play", GAMESTATE->m_iCoins.Get(), PREFSMAN->m_iCoinsPerCredit.Get() );
 
-	// If inserting coins, play the appropriate sound; if deducting coins, don't.
+	// If inserting coins, play an appropriate sound; if deducting coins, don't play anything.
 	if (iNum > 0)
 	{
 		if( iNumCoinsOld != GAMESTATE->m_iCoins )

From d1ec94bcd7f3f6a17fe61b98512030bf8631bbfe Mon Sep 17 00:00:00 2001
From: Dan Guzek <dguzek@gmail.com>
Date: Mon, 1 Sep 2014 20:26:55 -0400
Subject: [PATCH 14/24] touch up style to InsertCredit and InsertCoin

Third time's the charm.
---
 src/GameState.cpp |  8 ++++++--
 src/StepMania.cpp | 12 +++++++++---
 2 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/src/GameState.cpp b/src/GameState.cpp
index b75952fe33..eb993a701e 100644
--- a/src/GameState.cpp
+++ b/src/GameState.cpp
@@ -2594,14 +2594,18 @@ public:
 	{
 		int numCoins = IArg(1);
 		if (GAMESTATE->m_iCoins + numCoins >= 0)
+		{
 			StepMania::InsertCoin(numCoins, false);
-		else
+		} else {
+			// Warn themers if they attempt to set credits to a negative value.
 			luaL_error( L, "Credits may not be negative." );
-
+		}
+		return 0;
 	}
 	static int InsertCredit( T* p, lua_State *L )
 	{
 		StepMania::InsertCredit();
+		return 0;
 	}
 	static int CurrentOptionsDisqualifyPlayer( T* p, lua_State *L )	{ lua_pushboolean(L, p->CurrentOptionsDisqualifyPlayer(Enum::Check<PlayerNumber>(L, 1))); return 1; }
 
diff --git a/src/StepMania.cpp b/src/StepMania.cpp
index f0494f7dcc..d5f61fa629 100644
--- a/src/StepMania.cpp
+++ b/src/StepMania.cpp
@@ -1243,22 +1243,28 @@ void StepMania::InsertCoin( int iNum, bool bCountInBookkeeping )
 
 	// Don't allow GAMESTATE's coin count to become negative.
 	if (GAMESTATE->m_iCoins + iNum >= 0)
+	{
 		GAMESTATE->m_iCoins.Set( GAMESTATE->m_iCoins + iNum );
-
+	}
+	
 	int iCredits = GAMESTATE->m_iCoins / PREFSMAN->m_iCoinsPerCredit;
 	bool bMaxCredits = iCredits >= MAX_NUM_CREDITS;
 	if( bMaxCredits )
+	{
 		GAMESTATE->m_iCoins.Set( MAX_NUM_CREDITS * PREFSMAN->m_iCoinsPerCredit );
-
+	}
+	
 	LOG->Trace("%i coins inserted, %i needed to play", GAMESTATE->m_iCoins.Get(), PREFSMAN->m_iCoinsPerCredit.Get() );
 
 	// If inserting coins, play an appropriate sound; if deducting coins, don't play anything.
 	if (iNum > 0)
 	{
 		if( iNumCoinsOld != GAMESTATE->m_iCoins )
+		{
 			SCREENMAN->PlayCoinSound();
-		else
+		} else {
 			SCREENMAN->PlayInvalidSound();
+		}
 	}
 
 	/* If AutoJoin and a player is already joined, then try to join a player.

From fcf51f4cc0b5976446c8ba1fc0c92e7a573a768c Mon Sep 17 00:00:00 2001
From: Kyzentun <kyzentun@gmail.com>
Date: Mon, 1 Sep 2014 19:10:52 -0600
Subject: [PATCH 15/24] Added djpohly to credits.

---
 Themes/_fallback/Scripts/04 CreditsHelpers.lua | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/Themes/_fallback/Scripts/04 CreditsHelpers.lua b/Themes/_fallback/Scripts/04 CreditsHelpers.lua
index 4bd43fe955..50c6103d67 100644
--- a/Themes/_fallback/Scripts/04 CreditsHelpers.lua	
+++ b/Themes/_fallback/Scripts/04 CreditsHelpers.lua	
@@ -64,12 +64,14 @@ local stepmania_credits= {
 		"Christophe Goulet-LeBlanc (Kommisar)", -- songs
 		"corec", -- various fixes
 		"cybik", -- Android port
+		"dbk2", -- mac builds, a couple actor behavior fixes, new lua bindings
+		"djpohly", -- piuio kernel module, XML compatibility, other useful stuff
 		"galopin", -- piu PlayStation2 usb mat support
 		"gholms", -- automake 1.11 support
 		"juanelote", -- SongManager:GetSongGroupByIndex, JumpToNext/PrevGroup logic mods
 		"Kaox", -- pump/default noteskin
 		-- Add Graphics/CreditsLogo name.png and change your entry to a table like this to look super pro.
-		{logo= "kyzentun", name= "Kyzentun"}, -- new lua bindings
+		{logo= "kyzentun", name= "Kyzentun"}, -- new lua bindings, theme documentation
 		"Mad Matt", -- new lua bindings
 		"NitroX72", -- pump/frame noteskin
 		"Petriform", -- default theme music
@@ -84,7 +86,6 @@ local stepmania_credits= {
 		"A Pseudonymous Coder", -- support
 		"Bill Shillito (DM Ashura)", -- Music (not yet though)
 		"cpubasic13", -- testing (a lot)
-		"dbk2", -- mac builds, a couple actor behavior fixes
 		"Dreamwoods",
 		"Jason Bolt (LightningXCE)",
 		"Jousway", -- Noteskins
@@ -97,7 +98,7 @@ local stepmania_credits= {
 	{
 		name= "Shoutouts",
 		"The Lua team", -- lua project lead or some shit. super nerdy but oh hell.
-		"Mojang AB", -- minecraft forever -freem
+		{logo= "mojang", name= "Mojang AB"}, -- minecraft forever -freem
 		"Wolfire Games", -- piles of inspiration
 		"NAKET Coder",
 		"Ciera Boyd", -- you bet your ass I'm putting my girlfriend in the credits -shakesoda
@@ -111,6 +112,7 @@ local kyzentuns_fancy_value= 16
 
 local special_logos= {
 	kyzentun= Def.ActorMultiVertex{
+		Name= "logo",
 		Texture= THEME:GetPathG("CreditsLogo", "kyzentun"),
 		OnCommand= function(self)
 			self:SetDrawState{Mode= "DrawMode_Quads"}
@@ -161,6 +163,12 @@ local special_logos= {
 			self:queuecommand("normal_state")
 		end,
 	},
+	mojang= Def.Actor{
+		Name= "logo",
+		OnCommand= function(self)
+			self:GetParent():GetChild("name"):distort(.25) -- minecraft is broken, -kyz
+		end
+	}
 }
 
 -- Go through the credits and swap in the special logos.

From ce1556514550586ccb4a77ebf4f260466238ee56 Mon Sep 17 00:00:00 2001
From: freem <aj187@ajworld.net>
Date: Mon, 1 Sep 2014 23:04:07 -0500
Subject: [PATCH 16/24] fix ScreenEvaluation background not being centered
 properly

---
 .../BGAnimations/ScreenEvaluation background/default.lua       | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/Themes/default/BGAnimations/ScreenEvaluation background/default.lua b/Themes/default/BGAnimations/ScreenEvaluation background/default.lua
index 79b3839644..672b344bf3 100644
--- a/Themes/default/BGAnimations/ScreenEvaluation background/default.lua	
+++ b/Themes/default/BGAnimations/ScreenEvaluation background/default.lua	
@@ -1,7 +1,6 @@
 local t = Def.ActorFrame {};
 
 t[#t+1] = Def.ActorFrame {
-	InitCommand=cmd(Center);
 	Def.Sprite {
 		OnCommand=function(self)
 			if GAMESTATE:GetCurrentSong() then
@@ -20,7 +19,7 @@ t[#t+1] = Def.ActorFrame {
 		end;
 	};
 	Def.Quad {
-		InitCommand=cmd(scaletoclipped,SCREEN_WIDTH+1,SCREEN_HEIGHT);
+		InitCommand=cmd(Center;scaletoclipped,SCREEN_WIDTH+1,SCREEN_HEIGHT);
 		OnCommand=cmd(diffuse,color("#FFCB05");diffusebottomedge,color("#F0BA00");diffusealpha,0.45);
 	};
 };

From cecfff079d7b6d9ae48ab49bd07a4bf94421f451 Mon Sep 17 00:00:00 2001
From: freem <aj187@ajworld.net>
Date: Tue, 2 Sep 2014 00:01:09 -0500
Subject: [PATCH 17/24] update stepmania.com links to point to
 old.stepmania.com where needed

---
 Docs/Changelog_sm-ssc.txt       | 14 +++++++-------
 Docs/Devdocs/SMXML.txt          |  4 ++--
 Docs/SimfileFormats/SDF/SDF.txt |  2 +-
 Docs/credits.txt                |  2 +-
 Docs/old_changelog.txt          | 10 +++++-----
 5 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/Docs/Changelog_sm-ssc.txt b/Docs/Changelog_sm-ssc.txt
index fe3c392291..d7e8dfd92f 100644
--- a/Docs/Changelog_sm-ssc.txt
+++ b/Docs/Changelog_sm-ssc.txt
@@ -874,7 +874,7 @@ sm-ssc v1.0 Release Candidate 1 | 20100627
 * [Screen] add GetScreenType() Lua binding.
 * howl's patch for fixing LowLevelWindow
   (stepmania4-fullscreen-focus-lost-and-restore-resolution2.patch)
-  http://www.stepmania.com/forums/showthread.php?t=23693
+  http://old.stepmania.com/forums/showthread.php?t=23693
 
 20100608
 --------
@@ -1564,7 +1564,7 @@ Theme-related additions/bugfixes aren't listed here, usually.
 --------
 * (smpackage) sm4svn r28243: "fix for FlushDirCache" [Chris Danford]
 * Fix Beginner Helper rest location [sy567]
- (see http://www.stepmania.com/forums/showpost.php?p=158721&postcount=12)
+ (see http://old.stepmania.com/forums/showpost.php?p=158721&postcount=12)
 
 20091211
 --------
@@ -1596,7 +1596,7 @@ the gametype causes the DifficultyList/StepsDisplayList to not show anything.
 20091206
 --------
 Implement a patch to support modern versions of ffmpeg.
-(See http://www.stepmania.com/forums/showthread.php?t=21434 for more info.)
+(See http://old.stepmania.com/forums/showthread.php?t=21434 for more info.)
 
 Petr Baudis (3):
 	video.m4: Add libswscale checks.
@@ -1681,7 +1681,7 @@ changes are from baseline StepMania 4 SVN, in order to keep compatibility.
 --------
 * [ArchHooks_Unix] Follow user's system language as default.
   [David Santamaría Rogado (howl)]
-  See http://www.stepmania.com/forums/showthread.php?t=21471 for more info.
+  See http://old.stepmania.com/forums/showthread.php?t=21471 for more info.
 
 20091120
 --------
@@ -1707,7 +1707,7 @@ changes are from baseline StepMania 4 SVN, in order to keep compatibility.
 --------
 * Prevent focus lost at Fullscreen on X11, fix windowed->fullscreen resolution
   changes so that they save [David Santamaría Rogado (howl)]
-  (http://www.stepmania.com/forums/showthread.php?t=21430)
+  (http://old.stepmania.com/forums/showthread.php?t=21430)
 
 20091114
 --------
@@ -1754,10 +1754,10 @@ changes are from baseline StepMania 4 SVN, in order to keep compatibility.
  * r28221: "allow overriding, like PRODUCT_ID" [Glenn Maynard]
  * r28222-28223: "adding support for pms files" [GRIM657]
  * The pulseaudio patch [David Santamaría Rogado (howl), Ondřej Hošek, Damien Thébault]
-   (see http://www.stepmania.com/forums/showthread.php?t=21348)
+   (see http://old.stepmania.com/forums/showthread.php?t=21348)
  * Greg Nadja's OpenGL/Windows patch
  * Load Splash.png instead of an .xpm [David Santamaría Rogado (howl)]
-   (http://www.stepmania.com/forums/showpost.php?p=157340&postcount=3)
+   (http://old.stepmania.com/forums/showpost.php?p=157340&postcount=3)
 
 * sm-ssc Changes:
  * [ScreenSelectMusic.cpp] Add SelectMenuInputMessage, has params Player and
diff --git a/Docs/Devdocs/SMXML.txt b/Docs/Devdocs/SMXML.txt
index d3d9222d63..c43b9f3642 100644
--- a/Docs/Devdocs/SMXML.txt
+++ b/Docs/Devdocs/SMXML.txt
@@ -30,5 +30,5 @@ The Credentials section seems to be optional, but is useful to know about:
 from the web site to StepMania for things like in-game uploads (instead of going
 to stepmaniashare.com)"[1]
 __________________________________________________________
-[1] http://www.stepmania.com/forums/showthread.php?t=24203
-[2] http://www.stepmania.com/test.smxml
\ No newline at end of file
+[1] http://old.stepmania.com/forums/showthread.php?t=24203
+[2] http://old.stepmania.com/test.smxml
\ No newline at end of file
diff --git a/Docs/SimfileFormats/SDF/SDF.txt b/Docs/SimfileFormats/SDF/SDF.txt
index f387210532..68d8c60c77 100644
--- a/Docs/SimfileFormats/SDF/SDF.txt
+++ b/Docs/SimfileFormats/SDF/SDF.txt
@@ -1,4 +1,4 @@
-Used by Pocket DDR (http://www.stepmania.com/forums/showthread.php?t=6621).
+Used by Pocket DDR (http://old.stepmania.com/forums/showthread.php?t=6621).
 Basically a compressed version of a .SM that includes the banner and background
 in the file as well.
 
diff --git a/Docs/credits.txt b/Docs/credits.txt
index 8221a56aed..0c7e7ddd79 100644
--- a/Docs/credits.txt
+++ b/Docs/credits.txt
@@ -89,7 +89,7 @@ Macgravel
 
 hanubeki (@803832, formerly sy567)
  * Small beginner helper fix
- (http://www.stepmania.com/forums/showpost.php?p=158721&postcount=12)
+ (http://old.stepmania.com/forums/showpost.php?p=158721&postcount=12)
  * Lots of code changes from hanubeki-modified-sm-ssc:
  http://code.google.com/r/hanubeki-modified-sm-ssc/
 
diff --git a/Docs/old_changelog.txt b/Docs/old_changelog.txt
index 53163a0351..5c26476649 100644
--- a/Docs/old_changelog.txt
+++ b/Docs/old_changelog.txt
@@ -90,7 +90,7 @@ r111 | 20091122 10:21:30
 ------------------------
 * [ArchHooks_Unix] Follow user's system language as default.
   [David Santamar�a Rogado (howl)]
-  See http://www.stepmania.com/forums/showthread.php?t=21471 for more info.
+  See http://old.stepmania.com/forums/showthread.php?t=21471 for more info.
 
 r110 | 20091120 14:03:17
 ------------------------
@@ -119,7 +119,7 @@ r106 | 20091115 21:33:28
 ------------------------
 * Prevent focus lost at Fullscreen on X11, fix windowed->fullscreen resolution
   changes so that they save [David Santamar�a Rogado (howl)]
-  (http://www.stepmania.com/forums/showthread.php?t=21430)
+  (http://old.stepmania.com/forums/showthread.php?t=21430)
 
 r105 | 20091114 15:07:58
 ------------------------
@@ -153,7 +153,7 @@ r102 | 20091111 04:00:46
 r101 | 20091109 19:33:55
 ------------------------
 * Implemented David Santamar�a Rogado (howl)'s patch for loading Splash.png instead of an .xpm
-(http://www.stepmania.com/forums/showpost.php?p=157340&postcount=3)
+(http://old.stepmania.com/forums/showpost.php?p=157340&postcount=3)
 
 r089-100 | 20091103 01:45:01 - 20091109 04:01:31
 ------------------------------------------------
@@ -176,7 +176,7 @@ Okay let's just say it's r089 to r100 and call it a week.
  * r28221: "allow overriding, like PRODUCT_ID" [Glenn Maynard]
  * r28222-28223: "adding support for pms files" [GRIM657]
  * The pulseaudio patch [David Santamar�a Rogado (howl), Ondřej Hošek, Damien Thébault]
-   (see http://www.stepmania.com/forums/showthread.php?t=21348)
+   (see http://old.stepmania.com/forums/showthread.php?t=21348)
  * Greg Nadja's OpenGL/Windows patch
 
 * sm-ssc Changes:
@@ -784,7 +784,7 @@ r1136 | 20091115 20:43:48
 [Modified /sm-ssc3/src/arch/LowLevelWindow/LowLevelWindowX11.cpp]
 -------------------------
 howl did it
-http://www.stepmania.com/forums/showthread.php?p=157603#post157603
+http://old.stepmania.com/forums/showthread.php?p=157603#post157603
 
 r1137 | 20091115 21:05:36
 [Modified /sm-ssc3/src/arch/LowLevelWindow/LowLevelWindowX11.cpp]

From 4f2b92a25ab1b43ed0aa68f189224bcdda4fa7b7 Mon Sep 17 00:00:00 2001
From: Kyzentun <kyzentun@gmail.com>
Date: Tue, 2 Sep 2014 05:18:29 -0600
Subject: [PATCH 18/24] Added __screen__ special texture name.  Added
 AMV:GetTexture, RageTexture:Reload, and Screen:SetNextScreenName lua
 functions.

---
 Docs/Luadoc/Lua.xml              |  3 +++
 Docs/Luadoc/LuaDocumentation.xml |  9 +++++++++
 src/ActorMultiVertex.cpp         | 14 ++++++++++++++
 src/ActorMultiVertex.h           |  1 +
 src/RageBitmapTexture.cpp        | 12 ++++++++++--
 src/RageTexture.cpp              |  6 ++++++
 src/RageTextureManager.cpp       | 21 ++++++++++++++++++++-
 src/RageTextureManager.h         |  3 +++
 src/Screen.cpp                   |  7 +++++++
 src/Screen.h                     |  1 +
 10 files changed, 74 insertions(+), 3 deletions(-)

diff --git a/Docs/Luadoc/Lua.xml b/Docs/Luadoc/Lua.xml
index 3e9d5c4669..d7a2d0c7de 100644
--- a/Docs/Luadoc/Lua.xml
+++ b/Docs/Luadoc/Lua.xml
@@ -490,6 +490,7 @@
 			<Function name='GetDestFirstToDraw'/>
 			<Function name='GetDestNumToDraw'/>
 			<Function name='GetNumVertices'/>
+			<Function name='GetTexture'/>
 			<Function name='LoadTexture'/>
 			<Function name='SetDrawState'/>
 			<Function name='SetEffectMode'/>
@@ -1297,6 +1298,7 @@
 			<Function name='loop'/>
 			<Function name='position'/>
 			<Function name='rate'/>
+			<Function name='Reload'/>
 		</Class>
 		<Class base='RageTexture' name='RageTextureRenderTarget'>
 			<Function name='BeginRenderingTo'/>
@@ -1316,6 +1318,7 @@
 			<Function name='Metric'/>
 			<Function name='PostScreenMessage'/>
 			<Function name='RemoveInputCallback'/>
+			<Function name='SetNextScreenName'/>
 			<Function name='String'/>
 			<Function name='lockinput'/>
 		</Class>
diff --git a/Docs/Luadoc/LuaDocumentation.xml b/Docs/Luadoc/LuaDocumentation.xml
index b0ad156762..45ca9c8976 100644
--- a/Docs/Luadoc/LuaDocumentation.xml
+++ b/Docs/Luadoc/LuaDocumentation.xml
@@ -1538,6 +1538,9 @@ save yourself some time, copy this for undocumented things:
 	<Function name='GetCurrNumToDraw' return='int' arguments='void'>
 		Get the NumToDraw of the current tween state.
 	</Function>
+	<Function name='GetTexture' return='RageTexture' arguments=''>
+		Returns the ActorMultiVertex's texture.
+	</Function>
 	<Function name='SetEffectMode' return='void' arguments='EffectMode em'>
 		Sets the <Link class='ENUM' function='EffectMode'>EffectMode</Link> of the ActorMultiVertex.
 	</Function>
@@ -3724,6 +3727,9 @@ save yourself some time, copy this for undocumented things:
 	<Function name='rate' return='void' arguments='float fRate'>
 		Sets the animation or movie playback rate to <code>fRate</code>.
 	</Function>
+	<Function name='Reload' return='void' arguments=''>
+		Reloads the texture.
+	</Function>
 </Class>
 <Class name='RollingNumbers'>
 	<Function name='Load' return='void' arguments='string sGroupName'>
@@ -3779,6 +3785,9 @@ save yourself some time, copy this for undocumented things:
 	<Function name='RemoveInputCallback' return='void' arguments='function callback'>
 		This removes the callback from the list.
 	</Function>
+	<Function name='SetNextScreenName' return='void' arguments='string name'>
+		Sets the NextScreen value to name.
+	</Function>
 	<Function name='String' theme='_fallback' return='string' arguments='string sName'>
 		[02 Other.lua] Gets a string from the current Screen in the current language.
 	</Function>
diff --git a/src/ActorMultiVertex.cpp b/src/ActorMultiVertex.cpp
index 4d1f932b45..0470c5ba25 100644
--- a/src/ActorMultiVertex.cpp
+++ b/src/ActorMultiVertex.cpp
@@ -645,6 +645,19 @@ public:
 		p->SetTexture( Texture );
 		return 0;
 	}
+	static int GetTexture(T* p, lua_State *L)
+	{
+		RageTexture *texture = p->GetTexture();
+		if(texture != NULL)
+		{
+			texture->PushSelf(L);
+		}
+		else
+		{
+			lua_pushnil(L);
+		}
+		return 1;
+	}
 
 	LunaActorMultiVertex()
 	{
@@ -668,6 +681,7 @@ public:
 
 		// Copy from RageTexture
 		ADD_METHOD( SetTexture );
+		ADD_METHOD( GetTexture );
 		// Load from file path
 		ADD_METHOD( LoadTexture );
 	}
diff --git a/src/ActorMultiVertex.h b/src/ActorMultiVertex.h
index 58d4158889..176d2a7cad 100644
--- a/src/ActorMultiVertex.h
+++ b/src/ActorMultiVertex.h
@@ -75,6 +75,7 @@ public:
 	void FinishTweening();
 	
 	void SetTexture( RageTexture *Texture );
+	RageTexture* GetTexture() { return _Texture; };
 	void LoadFromTexture( RageTextureID ID );
 
 	void UnloadTexture();
diff --git a/src/RageBitmapTexture.cpp b/src/RageBitmapTexture.cpp
index 07d0ca16a5..3c58fc0b82 100644
--- a/src/RageBitmapTexture.cpp
+++ b/src/RageBitmapTexture.cpp
@@ -65,7 +65,15 @@ void RageBitmapTexture::Create()
 
 	/* Load the image into a RageSurface. */
 	RString error;
-	RageSurface *pImg = RageSurfaceUtils::LoadFile( actualID.filename, error );
+	RageSurface *pImg= NULL;
+	if(actualID.filename == TEXTUREMAN->GetScreenTextureID().filename)
+	{
+		pImg= TEXTUREMAN->GetScreenSurface();
+	}
+	else
+	{
+		pImg= RageSurfaceUtils::LoadFile(actualID.filename, error);
+	}
 
 	/* Tolerate corrupt/unknown images. */
 	if( pImg == NULL )
@@ -122,7 +130,7 @@ void RageBitmapTexture::Create()
 	m_iSourceWidth = pImg->w;
 	m_iSourceHeight = pImg->h;
 
-	/* in-game imsage dimensions are the same as the source graphic */
+	/* in-game image dimensions are the same as the source graphic */
 	m_iImageWidth = m_iSourceWidth;
 	m_iImageHeight = m_iSourceHeight;
 
diff --git a/src/RageTexture.cpp b/src/RageTexture.cpp
index 944f54c180..88d17d97d2 100644
--- a/src/RageTexture.cpp
+++ b/src/RageTexture.cpp
@@ -84,6 +84,11 @@ public:
 		lua_pushnumber(L, p->GetNumFrames());
 		return 1;
 	}
+	static int Reload(T* p, lua_State* L)
+	{
+		p->Reload();
+		return 0;
+	}
 
 	LunaRageTexture()
 	{
@@ -92,6 +97,7 @@ public:
 		ADD_METHOD( rate );
 		ADD_METHOD( GetTextureCoordRect );
 		ADD_METHOD( GetNumFrames );
+		ADD_METHOD( Reload );
 	}
 };
 
diff --git a/src/RageTextureManager.cpp b/src/RageTextureManager.cpp
index 5e66e33275..51134de06b 100644
--- a/src/RageTextureManager.cpp
+++ b/src/RageTextureManager.cpp
@@ -100,6 +100,17 @@ RageTextureID RageTextureManager::GetDefaultTextureID()
 	return RageTextureID( g_sDefaultTextureName );
 }
 
+static const RString g_ScreenTextureName = "__screen__";
+RageTextureID RageTextureManager::GetScreenTextureID()
+{
+	return RageTextureID(g_ScreenTextureName);
+}
+
+RageSurface* RageTextureManager::GetScreenSurface()
+{
+	return DISPLAY->CreateScreenshot();
+}
+
 class RageTexture_Default: public RageTexture
 {
 public:
@@ -141,11 +152,19 @@ RageTexture* RageTextureManager::LoadTextureInternal( RageTextureID ID )
 
 	RageTexture* pTexture;
 	if( ID.filename == g_sDefaultTextureName )
+	{
 		pTexture = new RageTexture_Default;
-	else if( sExt == "ogv" || sExt == "avi" || sExt == "mpg" || sExt == "mpeg" || sExt == "mp4" || sExt == "mkv" || sExt == "mov" || sExt == "flv" || sExt == "f4v")
+	}
+	else if(sExt == "ogv" || sExt == "avi" || sExt == "mpg" ||
+		sExt == "mpeg" || sExt == "mp4" || sExt == "mkv" || sExt == "mov" ||
+		sExt == "flv" || sExt == "f4v")
+	{
 		pTexture = RageMovieTexture::Create( ID );
+	}
 	else
+	{
 		pTexture = new RageBitmapTexture( ID );
+	}
 
 	m_mapPathToTexture[ID] = pTexture;
 
diff --git a/src/RageTextureManager.h b/src/RageTextureManager.h
index dd41149834..8ce1ae8e1c 100644
--- a/src/RageTextureManager.h
+++ b/src/RageTextureManager.h
@@ -4,6 +4,7 @@
 #define RAGE_TEXTURE_MANAGER_H
 
 #include "RageTexture.h"
+#include "RageSurface.h"
 
 struct RageTextureManagerPrefs
 {
@@ -81,6 +82,8 @@ public:
 	bool GetOddDimensionWarning() const { return m_iNoWarnAboutOddDimensions == 0; }
 
 	RageTextureID GetDefaultTextureID();
+	RageTextureID GetScreenTextureID();
+	RageSurface* GetScreenSurface();
 
 private:
 	void DeleteTexture( RageTexture *t );
diff --git a/src/Screen.cpp b/src/Screen.cpp
index 3568fa0f9d..1100cdb350 100644
--- a/src/Screen.cpp
+++ b/src/Screen.cpp
@@ -268,6 +268,11 @@ RString Screen::GetNextScreenName() const
 	return NEXT_SCREEN;
 }
 
+void Screen::SetNextScreenName(RString const& name)
+{
+	m_sNextScreen= name;
+}
+
 RString Screen::GetPrevScreen() const
 {
 	if( !m_sPrevScreen.empty() )
@@ -403,6 +408,7 @@ class LunaScreen: public Luna<Screen>
 {
 public:
 	static int GetNextScreenName( T* p, lua_State *L ) { lua_pushstring(L, p->GetNextScreenName() ); return 1; }
+	static int SetNextScreenName( T* p, lua_State *L ) { p->SetNextScreenName(SArg(1)); return 0; }
 	static int GetPrevScreenName( T* p, lua_State *L ) { lua_pushstring(L, p->GetPrevScreen() ); return 1; }
 	static int lockinput( T* p, lua_State *L ) { p->SetLockInputSecs(FArg(1)); return 0; }
 	DEFINE_METHOD( GetScreenType,	GetScreenType() )
@@ -438,6 +444,7 @@ public:
 	LunaScreen()
 	{
 		ADD_METHOD( GetNextScreenName );
+		ADD_METHOD( SetNextScreenName );
 		ADD_METHOD( GetPrevScreenName );
 		ADD_METHOD( PostScreenMessage );
 		ADD_METHOD( lockinput );
diff --git a/src/Screen.h b/src/Screen.h
index 0de9447f06..7c5d56b02b 100644
--- a/src/Screen.h
+++ b/src/Screen.h
@@ -123,6 +123,7 @@ protected:
 public:
 	RString GetNextScreenName() const;
 	RString GetPrevScreen() const;
+	void SetNextScreenName(RString const& name);
 
 	bool PassInputToLua(const InputEventPlus& input);
 	void AddInputCallbackFromStack(lua_State* L);

From e3f8d272c11be0297fe29ce9e43d201f70875c5a Mon Sep 17 00:00:00 2001
From: Kyzentun <kyzentun@gmail.com>
Date: Tue, 2 Sep 2014 14:33:55 -0600
Subject: [PATCH 19/24] istream::operator bool() is explicit in C++11, use git
 diff

---
 src/RageUtil.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/RageUtil.cpp b/src/RageUtil.cpp
index 872734c1f4..8255f9e96d 100644
--- a/src/RageUtil.cpp
+++ b/src/RageUtil.cpp
@@ -1753,12 +1753,12 @@ void MakeLower( wchar_t *p, size_t iLen )
 
 bool operator>>(const RString& lhs, int& rhs)
 {
-	return istringstream(lhs) >> rhs;
+	return !!(istringstream(lhs) >> rhs);
 }
 
 bool operator>>(const RString& lhs, float& rhs)
 {
-	return istringstream(lhs) >> rhs;
+	return !!(istringstream(lhs) >> rhs);
 }
 
 int StringToInt( const RString &sString )

From f2fdaa0cf5b9a4789acbfb884283aec5b4e59b4b Mon Sep 17 00:00:00 2001
From: Kyzentun <kyzentun@gmail.com>
Date: Thu, 4 Sep 2014 01:23:28 -0600
Subject: [PATCH 20/24] Massively improved Config Key/Joy Mappings screen.
 Warning is dismissable now, and cursor does not start in a position that will
 change a setting. New special actions added:  ClearToDefault, ReloadFromDisk,
 SaveToDisk, SetListMode.  Exit is a special action. Player is prompted to
 save when exiting screen instead of saving after every action. Special
 actions fallback on Graphics/SMC action if they don't have their own. Moved
 SMC overlay to Graphics/SMC warning. Metrics for configuring input lock time,
 warning autodismiss time, lines visible, and NoSetListPrompt autodismiss
 time. Header row added for cursor to start on. ScreenMapControllers2 deleted
 as obsolete. BitmapText:maxwidth changed to factor the zoom of the actor into
 the calculation.

---
 .../ScreenMapControllers overlay.lua          |  27 -
 .../Graphics/ScreenMapControllers action.lua  |  16 +
 .../Graphics/ScreenMapControllers exit.lua    |  10 -
 .../ScreenMapControllers nosetlistprompt.lua  |  17 +
 .../Graphics/ScreenMapControllers warning.lua |  24 +
 Themes/_fallback/Languages/en.ini             |  14 +-
 Themes/_fallback/metrics.ini                  |  21 +-
 Themes/default/metrics.ini                    |   1 +
 src/ActorUtil.cpp                             |   2 +-
 src/AutoActor.cpp                             |   5 +-
 src/BitmapText.cpp                            |  47 +-
 src/InputMapper.cpp                           |   7 +
 src/InputMapper.h                             |   1 +
 src/ScreenMapControllers.cpp                  | 459 ++++++++++++---
 src/ScreenMapControllers.h                    |  70 ++-
 src/ScreenMapControllers2.cpp                 | 532 ------------------
 src/ScreenMapControllers2.h                   | 136 -----
 17 files changed, 574 insertions(+), 815 deletions(-)
 delete mode 100644 Themes/_fallback/BGAnimations/ScreenMapControllers overlay.lua
 create mode 100644 Themes/_fallback/Graphics/ScreenMapControllers action.lua
 delete mode 100644 Themes/_fallback/Graphics/ScreenMapControllers exit.lua
 create mode 100644 Themes/_fallback/Graphics/ScreenMapControllers nosetlistprompt.lua
 create mode 100644 Themes/_fallback/Graphics/ScreenMapControllers warning.lua
 delete mode 100644 src/ScreenMapControllers2.cpp
 delete mode 100644 src/ScreenMapControllers2.h

diff --git a/Themes/_fallback/BGAnimations/ScreenMapControllers overlay.lua b/Themes/_fallback/BGAnimations/ScreenMapControllers overlay.lua
deleted file mode 100644
index 9f90de1fc3..0000000000
--- a/Themes/_fallback/BGAnimations/ScreenMapControllers overlay.lua	
+++ /dev/null
@@ -1,27 +0,0 @@
-local waitTime = 7.5
-
-local t = Def.ActorFrame {
-	InitCommand=cmd(x,SCREEN_CENTER_X;y,SCREEN_CENTER_Y);
-	OnCommand=cmd(queuecommand,"TweenOn";sleep,waitTime;queuecommand,"TweenOff");
-}
-t[#t+1] = Def.Quad {
-	InitCommand=cmd(zoomto,SCREEN_WIDTH,SCREEN_HEIGHT;diffuse,Color.Black);
-	TweenOnCommand=cmd(diffusealpha,1;linear,0.5;diffusealpha,0.8);
-	TweenOffCommand=cmd(linear,0.5;diffusealpha,0);
-};
-t[#t+1] = Def.ActorFrame {
-	LoadFont("Common Normal") .. {
-		Text=ScreenString("WarningHeader");
-		InitCommand=cmd(y,-70;diffuse,Color.Red);
-		TweenOnCommand=cmd(diffusealpha,0;zoomx,2;zoomy,0;sleep,0.5;smooth,0.25;zoom,1;diffusealpha,1);
-		TweenOffCommand=cmd(linear,0.5;diffusealpha,0);
-	};
-	LoadFont("Common Normal") .. {
-		Text=ScreenString("WarningText");
-		InitCommand=cmd(y,10;wrapwidthpixels,SCREEN_WIDTH-48);
-		TweenOnCommand=cmd(diffusealpha,0;sleep,0.5125;linear,0.125;diffusealpha,1);
-		TweenOffCommand=cmd(linear,0.5;diffusealpha,0);
-	};
-};
-
-return t
\ No newline at end of file
diff --git a/Themes/_fallback/Graphics/ScreenMapControllers action.lua b/Themes/_fallback/Graphics/ScreenMapControllers action.lua
new file mode 100644
index 0000000000..0ff5737aa3
--- /dev/null
+++ b/Themes/_fallback/Graphics/ScreenMapControllers action.lua	
@@ -0,0 +1,16 @@
+return LoadFont("Common Normal") .. {
+	InitCommand= cmd(x, SCREEN_CENTER_X; zoom, .75; shadowlength, 0; diffuse, color("#808080")),
+	OnCommand= function(self)
+		self:diffusealpha(0)
+		self:decelerate(0.5)
+		self:diffusealpha(1)
+		-- fancy effect:  Look at the name (which is set by the screen) to set text
+		self:settext(
+			THEME:GetString("ScreenMapControllers", "Action" .. self:GetName()))
+	end,
+	OffCommand=cmd(stoptweening;accelerate,0.3;diffusealpha,0;queuecommand,"Hide");
+	HideCommand=cmd(visible,false);
+
+	GainFocusCommand=cmd(diffuseshift;effectcolor2,color("#808080");effectcolor1,color("#FFFFFF"));
+	LoseFocusCommand=cmd(stopeffect);
+};
diff --git a/Themes/_fallback/Graphics/ScreenMapControllers exit.lua b/Themes/_fallback/Graphics/ScreenMapControllers exit.lua
deleted file mode 100644
index e922b168d6..0000000000
--- a/Themes/_fallback/Graphics/ScreenMapControllers exit.lua	
+++ /dev/null
@@ -1,10 +0,0 @@
-return LoadFont("Common Normal") .. {
-	Text="Exit";
-	InitCommand=cmd(x,SCREEN_CENTER_X;zoom,0.75;shadowlength,0;diffuse,color("#808080"));
-	OnCommand=cmd(diffusealpha,0;decelerate,0.5;diffusealpha,1);
-	OffCommand=cmd(stoptweening;accelerate,0.3;diffusealpha,0;queuecommand,"Hide");
-	HideCommand=cmd(visible,false);
-
-	GainFocusCommand=cmd(diffuseshift;effectcolor2,color("#808080");effectcolor1,color("#FFFFFF"));
-	LoseFocusCommand=cmd(stopeffect);
-};
diff --git a/Themes/_fallback/Graphics/ScreenMapControllers nosetlistprompt.lua b/Themes/_fallback/Graphics/ScreenMapControllers nosetlistprompt.lua
new file mode 100644
index 0000000000..a965e5f5e7
--- /dev/null
+++ b/Themes/_fallback/Graphics/ScreenMapControllers nosetlistprompt.lua	
@@ -0,0 +1,17 @@
+return Def.ActorFrame{
+	InitCommand=cmd(x,SCREEN_CENTER_X;y,SCREEN_CENTER_Y),
+	Def.Quad{
+		InitCommand=cmd(zoomto,SCREEN_WIDTH,SCREEN_HEIGHT;diffuse,Color.Black;diffusealpha,0),
+		TweenOnCommand=cmd(stoptweening;diffusealpha,1;linear,0.5;diffusealpha,0.8),
+		TweenOffCommand=cmd(stoptweening;linear,0.5;diffusealpha,0),
+	},
+	Def.ActorFrame{
+		Def.BitmapText{
+			Font="Common Normal",
+			Text=ScreenString("NoSetListPrompt"),
+			InitCommand=cmd(y,10;wrapwidthpixels,SCREEN_WIDTH-48;diffusealpha,0),
+			TweenOnCommand=cmd(stoptweening;diffusealpha,0;sleep,0.5125;linear,0.125;diffusealpha,1),
+			TweenOffCommand=cmd(stoptweening;linear,0.5;diffusealpha,0),
+		},
+	},
+}
diff --git a/Themes/_fallback/Graphics/ScreenMapControllers warning.lua b/Themes/_fallback/Graphics/ScreenMapControllers warning.lua
new file mode 100644
index 0000000000..908f127ab4
--- /dev/null
+++ b/Themes/_fallback/Graphics/ScreenMapControllers warning.lua	
@@ -0,0 +1,24 @@
+return Def.ActorFrame{
+	InitCommand=cmd(x,SCREEN_CENTER_X;y,SCREEN_CENTER_Y),
+	Def.Quad{
+		InitCommand=cmd(zoomto,SCREEN_WIDTH,SCREEN_HEIGHT;diffuse,Color.Black),
+		TweenOnCommand=cmd(diffusealpha,1;linear,0.5;diffusealpha,0.8),
+		TweenOffCommand=cmd(linear,0.5;diffusealpha,0),
+	},
+	Def.ActorFrame{
+		Def.BitmapText{
+			Font="Common Normal",
+			Text=ScreenString("WarningHeader"),
+			InitCommand=cmd(y,-80;diffuse,Color.Red),
+			TweenOnCommand=cmd(diffusealpha,0;zoomx,2;zoomy,0;sleep,0.5;smooth,0.25;zoom,1;diffusealpha,1),
+			TweenOffCommand=cmd(linear,0.5;diffusealpha,0),
+		},
+		Def.BitmapText{
+			Font="Common Normal",
+			Text=ScreenString("WarningText"),
+			InitCommand=cmd(y,10;wrapwidthpixels,SCREEN_WIDTH-48),
+			TweenOnCommand=cmd(diffusealpha,0;sleep,0.5125;linear,0.125;diffusealpha,1),
+			TweenOffCommand=cmd(linear,0.5;diffusealpha,0),
+		},
+	},
+}
diff --git a/Themes/_fallback/Languages/en.ini b/Themes/_fallback/Languages/en.ini
index 4757b676c6..1d3b381432 100644
--- a/Themes/_fallback/Languages/en.ini
+++ b/Themes/_fallback/Languages/en.ini
@@ -1531,15 +1531,23 @@ Warning=Warning
 BodyText=The StepMania program source code is licensed under a permissive open-source license.\n\nThe StepMania name and logos are protected by Trademark law.\n\nThe StepMania default theme SOUNDS ARE SEPARATELY OWNED BY THE AUTHORS.  ALL OTHER THEME COMPONENTS ARE LICENSED UNDER THE STEPMANIA LICENSE.\n\nSee license.txt for details.
 
 [ScreenMapControllers]
+ActionClear=Clear To Default
+ActionReload=Reload From Disk
+ActionSave=Save To Disk
+ActionSetList=Assign List
+ActionExit=Exit
+Default=Default
 HeaderText=Map Controllers
 InvalidButton=That key can not be mapped.
+KeyName=Key Name
+NoSetListPrompt=No entries in the list to set.  Add entries to the list by hitting 'm' when the cursor is on them.
 %s slots=%s slots
+Primary=Primary
+SavePrompt=Save settings before exiting?
+Secondary=Secondary
 WarningHeader=WARNING!
 WarningText=Please ensure that you do not overwrite any important keymappings, such as:\n&MENULEFT; LEFT &MENURIGHT; RIGHT &MENUUP; UP &MENUDOWN; DOWN &START; START &BACK; BACK or &SELECT; SELECT. Do not apply keymappings that you do not know the function of or unmap important keys!
 
-[ScreenMapControllers2]
-Add Mapping=Add Mapping
-
 [ScreenNetRoom]
 Enter a description for the room:=Enter a description for the room:
 Enter a password for the room (blank, no password):=Enter a password for the room (blank, no password):
diff --git a/Themes/_fallback/metrics.ini b/Themes/_fallback/metrics.ini
index 50299c88b9..a9e94e5202 100644
--- a/Themes/_fallback/metrics.ini
+++ b/Themes/_fallback/metrics.ini
@@ -2855,13 +2855,28 @@ Fallback="ScreenOptionsServiceChild"
 NextScreen="ScreenOptionsService"
 HelpText=Screen.String("HelpTextMapControllers")
 #
-ScreenOnCommand=%function(self) MESSAGEMAN:Broadcast("KeyConfigRequestStall"); self:lockinput(5); end;
+LockInputSecs=2.5
+AutoDismissWarningSecs=2.5
+LinesVisible=16
+AutoDismissNoSetListPromptSecs=5
 #
 DevicesX=SCREEN_CENTER_X
 DevicesY=SCREEN_TOP+24
 DevicesOnCommand=zoom,0.75;draworder,5;strokecolor,color("0,0,0,1")
 DevicesOffCommand=
 #
+HeaderP1S1Command=x,SCREEN_CENTER_X-270
+HeaderP1S2Command=x,SCREEN_CENTER_X-195
+HeaderP1S3Command=x,SCREEN_CENTER_X-120
+HeaderP2S1Command=x,SCREEN_CENTER_X+120
+HeaderP2S2Command=x,SCREEN_CENTER_X+195
+HeaderP2S3Command=x,SCREEN_CENTER_X+270
+#
+headerCenterOnCommand=x,SCREEN_CENTER_X;y,-6;zoom,0.7;shadowlength,1;ztest,true
+HeaderOnCommand=diffuse,color("#808080");shadowlength,0;zoom,0.75;maxwidth,130;
+HeaderGainFocusCommand=diffuse,color("#808080");diffuseshift;effectcolor2,color("#808080");effectcolor1,color("#FFFFFF")
+HeaderLoseFocusCommand=diffuse,color("#808080");stopeffect
+#
 ButtonsToMap=""
 MappedToP1S1Command=x,SCREEN_CENTER_X-270
 MappedToP1S2Command=x,SCREEN_CENTER_X-195
@@ -2870,11 +2885,13 @@ MappedToP2S1Command=x,SCREEN_CENTER_X+120
 MappedToP2S2Command=x,SCREEN_CENTER_X+195
 MappedToP2S3Command=x,SCREEN_CENTER_X+270
 #
-MappedToOnCommand=diffuse,color("#808080");shadowlength,0;maxwidth,150;zoom,0.75
+MappedToOnCommand=diffuse,color("#808080");shadowlength,0;zoom,0.75;maxwidth,130
 MappedToWaitingCommand=diffuse,color("#FF8080");pulse;effectperiod,0.5;effectmagnitude,0.8,1.3,0
 MappedToMappedInputCommand=diffuse,color("#808080");diffuseshift;effectcolor2,color("#808080");effectcolor1,color("#FFFFFF")
 MappedToGainFocusCommand=diffuse,color("#808080");diffuseshift;effectcolor2,color("#808080");effectcolor1,color("#FFFFFF")
 MappedToLoseFocusCommand=diffuse,color("#808080");stopeffect
+MappedToGainMarkCommand=textglowmode,'TextGlowMode_Inner';glow,color("#FF00007f")
+MappedToLoseMarkCommand=textglowmode,'TextGlowMode_Inner';glow,color("#FF000000")
 #
 LineScrollerOnCommand=%function(self) self:draworder(-1); self:y(64) self:setsecondsperitem(0.1) self:SetTransformFromHeight(24) end
 LineScrollerOffCommand=
diff --git a/Themes/default/metrics.ini b/Themes/default/metrics.ini
index 3eb592a0ed..36ed3d2482 100644
--- a/Themes/default/metrics.ini
+++ b/Themes/default/metrics.ini
@@ -1339,6 +1339,7 @@ ItemsLongRowSharedX=SCREEN_CENTER_X
 [OptionRowMiniMenuContext]
 
 [ScreenMapControllers]
+LinesVisible=15
 
 [ScreenTestInput]
 
diff --git a/src/ActorUtil.cpp b/src/ActorUtil.cpp
index 6bbeb84e42..8a1910f058 100644
--- a/src/ActorUtil.cpp
+++ b/src/ActorUtil.cpp
@@ -221,7 +221,7 @@ Actor *ActorUtil::LoadFromNode( const XNode* _pNode, Actor *pParentActor )
 		// sClass is invalid
 		RString sError = ssprintf( "%s: invalid Class \"%s\"",
 			ActorUtil::GetWhere(&node).c_str(), sClass.c_str() );
-		Dialog::OK( sError );
+		LuaHelpers::ReportScriptError(sError);
 		return new Actor;	// Return a dummy object so that we don't crash in AutoActor later.
 	}
 
diff --git a/src/AutoActor.cpp b/src/AutoActor.cpp
index 26fdb4757f..b3620f96c5 100644
--- a/src/AutoActor.cpp
+++ b/src/AutoActor.cpp
@@ -6,7 +6,10 @@
 
 void AutoActor::Unload()
 {
-	delete m_pActor;
+	if(m_pActor != NULL)
+	{
+		delete m_pActor;
+	}
 	m_pActor=NULL;
 }
 
diff --git a/src/BitmapText.cpp b/src/BitmapText.cpp
index eb4093afb0..6cd5586650 100644
--- a/src/BitmapText.cpp
+++ b/src/BitmapText.cpp
@@ -513,35 +513,28 @@ void BitmapText::UnSetDistortion()
 
 void BitmapText::UpdateBaseZoom()
 {
-	if( m_fMaxWidth == 0 )
-	{
-		this->SetBaseZoomX( 1 );
-	}
-	else
-	{
-		const float fWidth = GetUnzoomedWidth();
-		if( fWidth != 0 ) // don't divide by 0
-		{
-			// Never decrease the zoom.
-			const float fZoom = min( 1, m_fMaxWidth/fWidth );
-			this->SetBaseZoomX( fZoom );
-		}
+	// don't divide by 0
+	// Never apply a zoom greater than 1.
+	// Factor in the non-base zoom so that maxwidth will be in terms of theme
+	// pixels when zoom is used.
+#define APPLY_DIMENSION_ZOOM(dimension_max, dimension_get, dimension_zoom_get, base_zoom_set) \
+	if(dimension_max == 0) \
+	{ \
+		base_zoom_set(1); \
+	} \
+	else \
+	{ \
+		const float dimension= dimension_get() / dimension_zoom_get(); \
+		if(dimension != 0) \
+		{ \
+			const float zoom= min(1, dimension_max / dimension); \
+			base_zoom_set(zoom); \
+		} \
 	}
 
-	if( m_fMaxHeight == 0 )
-	{
-		this->SetBaseZoomY( 1 );
-	}
-	else
-	{
-		const float fHeight = GetUnzoomedHeight();
-		if( fHeight != 0 ) // don't divide by 0
-		{
-			// Never decrease the zoom.
-			const float fZoom = min( 1, m_fMaxHeight/fHeight );
-			this->SetBaseZoomY( fZoom );
-		}
-	}
+	APPLY_DIMENSION_ZOOM(m_fMaxWidth, GetUnzoomedWidth, GetZoomX, SetBaseZoomX);
+	APPLY_DIMENSION_ZOOM(m_fMaxHeight, GetUnzoomedHeight, GetZoomY, SetBaseZoomY);
+#undef APPLY_DIMENSION_ZOOM
 }
 
 bool BitmapText::StringWillUseAlternate( const RString& sText, const RString& sAlternateText ) const
diff --git a/src/InputMapper.cpp b/src/InputMapper.cpp
index c2bd98106a..cc61833c64 100644
--- a/src/InputMapper.cpp
+++ b/src/InputMapper.cpp
@@ -654,6 +654,13 @@ void InputMapper::SaveMappingsToDisk()
 	m_mappings.WriteMappings( m_pInputScheme, SpecialFiles::KEYMAPS_PATH );
 }
 
+void InputMapper::ResetMappingsToDefault()
+{
+	m_mappings.Clear();
+	UpdateTempDItoGI();
+	AddDefaultMappingsForCurrentGameIfUnmapped();
+}
+
 static LocalizedString CONNECTED			( "InputMapper", "Connected" );
 static LocalizedString DISCONNECTED			( "InputMapper", "Disconnected" );
 static LocalizedString AUTOMAPPING_ALL_JOYSTICKS	( "InputMapper", "Auto-mapping all joysticks." );
diff --git a/src/InputMapper.h b/src/InputMapper.h
index dfad769167..9d2f2c10f5 100644
--- a/src/InputMapper.h
+++ b/src/InputMapper.h
@@ -150,6 +150,7 @@ public:
 
 	void ReadMappingsFromDisk();
 	void SaveMappingsToDisk();
+	void ResetMappingsToDefault();
 
 	void ClearAllMappings();
 
diff --git a/src/ScreenMapControllers.cpp b/src/ScreenMapControllers.cpp
index ed9fe0965a..adf39b6707 100644
--- a/src/ScreenMapControllers.cpp
+++ b/src/ScreenMapControllers.cpp
@@ -1,6 +1,7 @@
 #include "global.h"
 #include "ScreenMapControllers.h"
 #include "ScreenManager.h"
+#include "ScreenPrompt.h"
 #include "RageLog.h"
 #include "RageInput.h"
 #include "InputMapper.h"
@@ -9,8 +10,10 @@
 #include "InputEventPlus.h"
 #include "LocalizedString.h"
 
+AutoScreenMessage(SM_DoSaveAndExit);
 #define BUTTONS_TO_MAP			THEME->GetMetric ( m_sName, "ButtonsToMap" )
 static LocalizedString INVALID_BUTTON   ( "ScreenMapControllers", "InvalidButton" );
+static LocalizedString SAVE_PROMPT("ScreenMapControllers", "SavePrompt");
 #define MAPPED_TO_COMMAND(gc,slot)	THEME->GetMetricA( m_sName, ssprintf("MappedToP%iS%iCommand", gc+1, slot+1) )
 
 static const float g_fSecondsToWaitForInput = 0.05f;
@@ -22,10 +25,26 @@ REGISTER_SCREEN_CLASS( ScreenMapControllers );
 
 ScreenMapControllers::ScreenMapControllers()
 {
+	m_InSetListMode= false;
+	m_ChangeOccurred= false;
 	this->SubscribeToMessage( Message_AutoJoyMappingApplied );
 }
 
+ScreenMapControllers::~ScreenMapControllers()
+{
+	for(size_t i= 0; i < m_Line.size(); ++i)
+	{
+		SAFE_DELETE(m_Line[i]);
+	}
+}
+
 static LocalizedString PLAYER_SLOTS( "ScreenMapControllers", "%s slots" );
+static LocalizedString SLOT_NAMES[3]= {
+	LocalizedString("ScreenMapControllers", "Primary"),
+	LocalizedString("ScreenMapControllers", "Secondary"),
+	LocalizedString("ScreenMapControllers", "Default")
+};
+static LocalizedString KEYNAME("ScreenMapControllers", "KeyName");
 void ScreenMapControllers::Init()
 {
 	ScreenWithMenuElements::Init();
@@ -64,12 +83,11 @@ void ScreenMapControllers::Init()
 		}
 	}
 
-	int iRow = 0;
-
-	// header row
+	// slot names row
 	{
+		m_Line.push_back(new ActorFrame);
 		FOREACH_ENUM( GameController,  c )
-		{			
+		{
 			BitmapText &text = m_textLabel[c];
 			text.LoadFromFont( THEME->GetPathF(m_sName,"title") );
 			PlayerNumber pn = (PlayerNumber)c;
@@ -77,16 +95,40 @@ void ScreenMapControllers::Init()
 			RString sText = ssprintf(PLAYER_SLOTS.GetValue(), PlayerNumberToLocalizedString(pn).c_str());
 			text.SetText( sText );
 			ActorUtil::LoadAllCommands( text, m_sName );
-			m_Line[iRow].AddChild( &m_textLabel[c] );
+			m_Line.back()->AddChild( &m_textLabel[c] );
 		}
-		m_LineScroller.AddChild( &m_Line[iRow] );
-
-		iRow++;
+		m_LineScroller.AddChild(m_Line.back());
+	}
+	// header row
+	{
+		m_Line.push_back(new ActorFrame);
+		m_headerCenter.LoadFromFont(THEME->GetPathF(m_sName, "title"));
+		m_headerCenter.SetName("headerCenter");
+		m_headerCenter.SetText(KEYNAME);
+		ActorUtil::LoadAllCommands(m_headerCenter, m_sName);
+		m_Line.back()->AddChild(&m_headerCenter);
+		FOREACH_ENUM(GameController,  c)
+		{
+			for(int s= 0; s < NUM_SHOWN_GAME_TO_DEVICE_SLOTS; ++s)
+			{
+				BitmapText& text= m_headerLabels[c][s];
+				text.LoadFromFont(THEME->GetPathF(m_sName, "title"));
+				PlayerNumber pn = (PlayerNumber)c;
+				text.SetName("Header");
+				text.SetText(SLOT_NAMES[s]);
+				text.RunCommands(THEME->GetMetricA(
+						m_sName, ssprintf("HeaderP%iS%iCommand", c+1, s+1)));
+				ActorUtil::LoadAllCommands(text, m_sName);
+				m_Line.back()->AddChild(&text);
+			}
+		}
+		m_LineScroller.AddChild(m_Line.back());
 	}
 
 	// normal rows
 	for( unsigned b=0; b<m_KeysToMap.size(); b++ )
 	{
+		m_Line.push_back(new ActorFrame);
 		KeyToMap *pKey = &m_KeysToMap[b];
 
 		{
@@ -96,7 +138,7 @@ void ScreenMapControllers::Init()
 			RString sText = GameButtonToLocalizedString( INPUTMAPPER->GetInputScheme(), pKey->m_GameButton );
 			pName->SetText( sText );
 			ActorUtil::LoadAllCommands( *pName, m_sName );
-			m_Line[iRow].AddChild( pName );
+			m_Line.back()->AddChild( pName );
 		}
 		{
 			BitmapText *pSecondary = new BitmapText;
@@ -108,11 +150,11 @@ void ScreenMapControllers::Init()
 				sText = GameButtonToLocalizedString( INPUTMAPPER->GetInputScheme(), mb );
 			ActorUtil::LoadAllCommands( *pSecondary, m_sName );
 			pSecondary->SetText( sText );
-			m_Line[iRow].AddChild( pSecondary );
+			m_Line.back()->AddChild( pSecondary );
 		}
 
 		FOREACH_ENUM( GameController,  c )
-		{			
+		{
 			for( int s=0; s<NUM_SHOWN_GAME_TO_DEVICE_SLOTS; s++ ) 
 			{
 				pKey->m_textMappedTo[c][s] = new BitmapText;
@@ -120,34 +162,50 @@ void ScreenMapControllers::Init()
 				pKey->m_textMappedTo[c][s]->LoadFromFont( THEME->GetPathF(m_sName,"entry") );
 				pKey->m_textMappedTo[c][s]->RunCommands( MAPPED_TO_COMMAND(c,s) );
 				ActorUtil::LoadAllCommands( *pKey->m_textMappedTo[c][s], m_sName );
-				m_Line[iRow].AddChild( pKey->m_textMappedTo[c][s] );
+				m_Line.back()->AddChild( pKey->m_textMappedTo[c][s] );
 			}
 		}
-		m_Line[iRow].DeleteChildrenWhenDone();
-		m_Line[iRow].SetName( "Line" );
-		ActorUtil::LoadAllCommands( m_Line[iRow], m_sName );
-		m_LineScroller.AddChild( &m_Line[iRow] );
-
-		iRow++;
-	}	
-
-	// exit row
-	{
-		m_sprExit.Load( THEME->GetPathG(m_sName,"exit") );
-		m_sprExit->SetName( "Exit" );
-		ActorUtil::LoadAllCommands( *m_sprExit, m_sName );
-
-		m_Line[iRow].AddChild( m_sprExit );
-		m_LineScroller.AddChild( &m_Line[iRow] );
-
-		iRow++;
+		m_Line.back()->DeleteChildrenWhenDone();
+		m_Line.back()->SetName( "Line" );
+		ActorUtil::LoadAllCommands(m_Line.back(), m_sName);
+		m_LineScroller.AddChild(m_Line.back());
 	}
 
+#define ADD_ACTION(index, a, b, c, d, e) \
+	m_Line.push_back(new ActorFrame);	\
+	m_Actions[index].Load(a, b, c, d, e);
+
+	m_Actions.resize(5);
+	ADD_ACTION(0, m_sName, "Clear", &ScreenMapControllers::ClearToDefault,
+		m_Line.back(), &m_LineScroller);
+	ADD_ACTION(1, m_sName, "Reload", &ScreenMapControllers::ReloadFromDisk,
+		m_Line.back(), &m_LineScroller);
+	ADD_ACTION(2, m_sName, "Save", &ScreenMapControllers::SaveToDisk,
+		m_Line.back(), &m_LineScroller);
+	ADD_ACTION(3, m_sName, "SetList", &ScreenMapControllers::SetListMode,
+		m_Line.back(), &m_LineScroller);
+	ADD_ACTION(4, m_sName, "Exit", &ScreenMapControllers::ExitAction,
+		m_Line.back(), &m_LineScroller);
+#undef ADD_ACTION
+
+	m_MaxDestItem= (1 + m_KeysToMap.size() + m_Actions.size()) -
+		THEME->GetMetricI("ScreenMapControllers", "LinesVisible");
+
 	m_LineScroller.SetName( "LineScroller" );
 	ActorUtil::LoadAllCommands( m_LineScroller, m_sName );
 	m_LineScroller.SetNumItemsToDraw( (float) m_LineScroller.GetNumChildren()*2 );
 	m_LineScroller.Load2();
 	this->AddChild( &m_LineScroller );
+
+	m_NoSetListPrompt.Load(THEME->GetPathG(m_sName, "nosetlistprompt"));
+	m_NoSetListPrompt->SetName("NoSetListPrompt");
+	this->AddChild(m_NoSetListPrompt);
+
+	m_sprWarning.Load(THEME->GetPathG(m_sName, "warning"));
+	m_sprWarning->SetName("Warning");
+	m_sprWarning->SetDrawOrder(DRAW_ORDER_TRANSITIONS);
+	this->AddChild(m_sprWarning);
+	LOAD_ALL_COMMANDS(m_sprWarning);
 }
 
 void ScreenMapControllers::BeginScreen()
@@ -162,6 +220,10 @@ void ScreenMapControllers::BeginScreen()
 
 	Refresh();
 	AfterChangeFocus();
+	m_fLockInputSecs= THEME->GetMetricF(m_sName, "LockInputSecs");
+	m_AutoDismissWarningSecs= THEME->GetMetricF(m_sName, "AutoDismissWarningSecs");
+	m_AutoDismissNoSetListPromptSecs= 0.0f;
+	m_sprWarning->PlayCommand("TweenOn");
 }
 
 
@@ -169,34 +231,64 @@ void ScreenMapControllers::Update( float fDeltaTime )
 {
 	ScreenWithMenuElements::Update( fDeltaTime );
 
+	if(m_fLockInputSecs <= 0.0f)
+	{
+		bool was_above= m_AutoDismissWarningSecs > 0.0f;
+		m_AutoDismissWarningSecs-= fDeltaTime;
+		if(was_above && m_AutoDismissWarningSecs <= 0.0f)
+		{
+			DismissWarning();
+		}
+	}
+	if(m_AutoDismissNoSetListPromptSecs > 0.0f)
+	{
+		m_AutoDismissNoSetListPromptSecs-= fDeltaTime;
+		if(m_AutoDismissNoSetListPromptSecs <= 0.0f)
+		{
+			m_NoSetListPrompt->PlayCommand("TweenOff");
+		}
+	}
 	
 	//
 	// Update devices text
 	//
 	m_textDevices.SetText( INPUTMAN->GetDisplayDevicesString() );
 
-
 	if( !m_WaitingForPress.IsZero() && m_DeviceIToMap.IsValid() ) // we're going to map an input
 	{	
 		if( m_WaitingForPress.PeekDeltaTime() < g_fSecondsToWaitForInput )
 			return; /* keep waiting */
 		m_WaitingForPress.SetZero();
 
-		ASSERT( m_iCurButton < (int) m_KeysToMap.size() );
-		const KeyToMap *pKey = &m_KeysToMap[m_iCurButton];
+		ASSERT(CursorOnKey());
+		const KeyToMap *pKey = &m_KeysToMap[CurKeyIndex()];
 		
 		GameInput curGameI( (GameController)m_iCurController, pKey->m_GameButton );
 
 		INPUTMAPPER->SetInputMap( m_DeviceIToMap, curGameI, m_iCurSlot );
 		INPUTMAPPER->AddDefaultMappingsForCurrentGameIfUnmapped();
-
-		// commit to disk after each change
-		INPUTMAPPER->SaveMappingsToDisk();
-
-		Refresh();
+		m_ChangeOccurred= true;
 
 		BitmapText *pText = pKey->m_textMappedTo[m_iCurController][m_iCurSlot];
-		pText->PlayCommand( "MappedInput" );
+		pText->PlayCommand("MappedInput");
+		if(m_InSetListMode)
+		{
+			pText->PlayCommand("LoseMark");
+			++m_SetListCurrent;
+			if(m_SetListCurrent == m_SetList.end())
+			{
+				m_InSetListMode= false;
+				m_SetList.clear();
+			}
+			else
+			{
+				BeforeChangeFocus();
+				SetCursorFromSetListCurrent();
+				AfterChangeFocus();
+				StartWaitingForPress();
+			}
+		}
+		Refresh();
 		SCREENMAN->PlayStartSound();
 	}
 }
@@ -230,16 +322,47 @@ static bool IsAxis( const DeviceInput& DeviceI )
 
 bool ScreenMapControllers::Input( const InputEventPlus &input )
 {
-	if( m_fLockInputSecs > 0 )
+	if(m_fLockInputSecs > 0.0f)
+	{
 		return false;
+	}
+
+	if(m_AutoDismissWarningSecs > 0.0f)
+	{
+		if(input.type == IET_FIRST_PRESS &&
+			input.DeviceI.device == DEVICE_KEYBOARD &&
+			input.DeviceI.button == KEY_ENTER)
+		{
+			m_AutoDismissWarningSecs = 0.0f;
+			DismissWarning();
+		}
+		return false;
+	}
+
+	if(m_AutoDismissNoSetListPromptSecs > 0.0f)
+	{
+		if(input.type == IET_FIRST_PRESS &&
+			input.DeviceI.device == DEVICE_KEYBOARD &&
+			input.DeviceI.button == KEY_ENTER)
+		{
+			m_AutoDismissNoSetListPromptSecs = 0.0f;
+			m_NoSetListPrompt->PlayCommand("TweenOff");
+		}
+		return false;
+	}
 	
 	if( input.type != IET_FIRST_PRESS && input.type != IET_REPEAT )
+	{
 		return false;	// ignore
+	}
 	if( IsTransitioning() )
+	{
 		return false;	// ignore
+	}
 
-	LOG->Trace( "ScreenMapControllers::Input():  device: %d, button: %d", 
-		input.DeviceI.device, input.DeviceI.button );
+	// Whoever wants it can uncomment this log spew, I don't think it's necessary. -Kyz
+	// LOG->Trace( "ScreenMapControllers::Input():  device: %d, button: %d", 
+	// 	input.DeviceI.device, input.DeviceI.button );
 
 	int button = input.DeviceI.button;
 	bool bHandled = false;
@@ -290,11 +413,12 @@ bool ScreenMapControllers::Input( const InputEventPlus &input )
 		case KEY_DEL:
 		case KEY_SPACE:
 		case KEY_BACK: // Clear the selected input mapping.
-			if( m_iCurButton == (int) m_KeysToMap.size() )
-				break; // on exit
-
+			if(!CursorOnKey())
 			{
-				const KeyToMap *pKey = &m_KeysToMap[m_iCurButton];
+				break;
+			}
+			{
+				const KeyToMap *pKey = &m_KeysToMap[CurKeyIndex()];
 				GameInput curGameI( (GameController)m_iCurController, pKey->m_GameButton );
 				if( !INPUTMAPPER->ClearFromInputMap(curGameI, m_iCurSlot) )
 					break;
@@ -302,17 +426,18 @@ bool ScreenMapControllers::Input( const InputEventPlus &input )
 				INPUTMAPPER->AddDefaultMappingsForCurrentGameIfUnmapped();
 
 				m_soundDelete.Play();
-
-				// commit to disk after each change
-				INPUTMAPPER->SaveMappingsToDisk();
 				bHandled = true;
 			}
 			break;
 		case KEY_LEFT: // Move the selection left, wrapping up.
-			if( m_iCurButton == (int) m_KeysToMap.size() )
-				break; // on exit
+			if(CursorOnAction())
+			{
+				break;
+			}
 			if( m_iCurSlot == 0 && m_iCurController == 0 )
+			{
 				break;	// can't go left any more
+			}
 			BeforeChangeFocus();
 			m_iCurSlot--;
 			if( m_iCurSlot < 0 )
@@ -325,10 +450,14 @@ bool ScreenMapControllers::Input( const InputEventPlus &input )
 			bHandled = true;
 			break;
 		case KEY_RIGHT:	// Move the selection right, wrapping down.
-			if( m_iCurButton == (int) m_KeysToMap.size() )
-				break; // on exit
+			if(CursorOnAction())
+			{
+				break;
+			}
 			if( m_iCurSlot == NUM_CHANGABLE_SLOTS-1 && m_iCurController == NUM_GameController-1 )
+			{
 				break;	// can't go right any more
+			}
 			BeforeChangeFocus();
 			m_iCurSlot++;
 			if( m_iCurSlot > NUM_CHANGABLE_SLOTS-1 )
@@ -341,8 +470,10 @@ bool ScreenMapControllers::Input( const InputEventPlus &input )
 			bHandled = true;
 			break;
 		case KEY_UP: // Move the selection up.
-			if( m_iCurButton == 0 )
-				break;	// can't go up any more
+			if(!CursorCanGoUp())
+			{
+				break;
+			}
 			BeforeChangeFocus();
 			m_iCurButton--;
 			AfterChangeFocus();
@@ -350,8 +481,10 @@ bool ScreenMapControllers::Input( const InputEventPlus &input )
 			bHandled = true;
 			break;
 		case KEY_DOWN: // Move the selection down.
-			if( m_iCurButton == (int) m_KeysToMap.size() )
-				break;	// can't go down any more
+			if(!CursorCanGoDown())
+			{
+				break;
+			}
 			BeforeChangeFocus();
 			m_iCurButton++;
 			AfterChangeFocus();
@@ -359,35 +492,50 @@ bool ScreenMapControllers::Input( const InputEventPlus &input )
 			bHandled = true;
 			break;
 		case KEY_ESC: // Quit the screen.
-			SCREENMAN->PlayStartSound();
-			StartTransitioningScreen( SM_GoToNextScreen );
+			ExitAction();
 			bHandled = true;
 			break;
+		case KEY_Cm:
+			if(CursorOnKey())
+			{
+				SetListEntry to_add(SetListEntry(CurKeyIndex(), m_iCurController, m_iCurSlot));
+				set<SetListEntry>::iterator found= m_SetList.find(to_add);
+				if(found == m_SetList.end())
+				{
+					m_SetList.insert(to_add);
+					GetActorWithFocus()->PlayCommand("GainMark");
+				}
+				else
+				{
+					m_SetList.erase(found);
+					GetActorWithFocus()->PlayCommand("LoseMark");
+				}
+			}
+			break;
 		case KEY_ENTER: // Change the selection.
 		case KEY_KP_ENTER:
-			if( m_iCurButton == (int) m_KeysToMap.size() )
+			bHandled = true;
+			if(CursorOnAction())
 			{
+				(this->*m_Actions[CurActionIndex()].m_action)();
 				SCREENMAN->PlayStartSound();
-				StartTransitioningScreen( SM_GoToNextScreen );
 				break;
 			}
-
+			if(CursorOnHeader())
 			{
-				const KeyToMap *pKey = &m_KeysToMap[m_iCurButton];
-				BitmapText *pText = pKey->m_textMappedTo[m_iCurController][m_iCurSlot];
-				pText->PlayCommand( "Waiting" );
+				break;
 			}
-			m_WaitingForPress.Touch();
-			m_DeviceIToMap.MakeInvalid();
+			StartWaitingForPress();
 			SCREENMAN->PlayStartSound();
-			bHandled = true;
 			break;
 		}
 	}
 
 //	ScreenWithMenuElements::Input( input );	// default handler
 
-	LOG->Trace( "m_iCurSlot: %d m_iCurController: %d m_iCurButton: %d", m_iCurSlot, m_iCurController, m_iCurButton );
+	// This trace is also useless log spew.  Create a preference or something
+	// configurable if you disagree. -Kyz
+	// LOG->Trace( "m_iCurSlot: %d m_iCurController: %d m_iCurButton: %d", m_iCurSlot, m_iCurController, m_iCurButton );
 
 	Refresh();
 	return bHandled;
@@ -395,10 +543,16 @@ bool ScreenMapControllers::Input( const InputEventPlus &input )
 
 Actor *ScreenMapControllers::GetActorWithFocus()
 {
-	if( m_iCurButton == (int) m_KeysToMap.size() )
-		return m_sprExit;
+	if(CursorOnAction())
+	{
+		return m_Actions[CurActionIndex()].m_actor;
+	}
+	if(CursorOnHeader())
+	{
+		return &(m_headerLabels[m_iCurController][m_iCurSlot]);
+	}
 
-	const KeyToMap *pKey = &m_KeysToMap[m_iCurButton];
+	const KeyToMap *pKey = &m_KeysToMap[CurKeyIndex()];
 	return pKey->m_textMappedTo[m_iCurController][m_iCurSlot];
 }
 
@@ -434,7 +588,97 @@ void ScreenMapControllers::Refresh()
 		}
 	}
 
-	m_LineScroller.SetDestinationItem( (float) m_iCurButton );
+	m_LineScroller.SetDestinationItem(
+		static_cast<float>(min(m_iCurButton, m_MaxDestItem)));
+}
+
+void ScreenMapControllers::DismissWarning()
+{
+	m_sprWarning->PlayCommand("TweenOff");
+}
+
+bool ScreenMapControllers::CursorOnAction()
+{
+	// We have a header row, the rows for the keys, and the action rows.
+	// So every row after m_KeysToMap.size is an action row.
+	return m_iCurButton >= static_cast<int>(m_KeysToMap.size()+1);
+}
+
+bool ScreenMapControllers::CursorOnHeader()
+{
+	// We have a header row before all others.
+	// So the header is at 0.
+	return m_iCurButton == 0;
+}
+
+bool ScreenMapControllers::CursorOnKey()
+{
+	return !(CursorOnHeader() || CursorOnAction());
+}
+
+bool ScreenMapControllers::CursorCanGoUp()
+{
+	return m_iCurButton > 0;
+}
+
+bool ScreenMapControllers::CursorCanGoDown()
+{
+	return m_iCurButton < m_KeysToMap.size() + m_Actions.size();
+}
+
+int ScreenMapControllers::CurKeyIndex()
+{
+	// The header row is at 0, so subtract 1 from m_iCurButton.
+	return m_iCurButton - 1;
+}
+
+int ScreenMapControllers::CurActionIndex()
+{
+	// Subtract the header row and the keys.
+	return m_iCurButton - 1 - m_KeysToMap.size();
+}
+
+void ScreenMapControllers::SetCursorFromSetListCurrent()
+{
+	m_iCurButton= m_SetListCurrent->m_button + 1;
+	m_iCurController= m_SetListCurrent->m_controller;
+	m_iCurSlot= m_SetListCurrent->m_slot;
+}
+
+void ScreenMapControllers::StartWaitingForPress()
+{
+	const KeyToMap *pKey = &m_KeysToMap[CurKeyIndex()];
+	BitmapText *pText = pKey->m_textMappedTo[m_iCurController][m_iCurSlot];
+	pText->PlayCommand( "Waiting" );
+	m_WaitingForPress.Touch();
+	m_DeviceIToMap.MakeInvalid();
+}
+
+void ScreenMapControllers::HandleScreenMessage(const ScreenMessage SM)
+{
+	if(SM == SM_DoSaveAndExit)
+	{
+		switch(ScreenPrompt::s_LastAnswer)
+		{
+			DEFAULT_FAIL(ScreenPrompt::s_LastAnswer);
+			case ANSWER_YES:
+				SaveToDisk();
+				SCREENMAN->PlayStartSound();
+				StartTransitioningScreen(SM_GoToNextScreen);
+				break;
+			case ANSWER_NO:
+				ReloadFromDisk();
+				SCREENMAN->PlayStartSound();
+				StartTransitioningScreen(SM_GoToNextScreen);
+				break;
+			case ANSWER_CANCEL:
+				break;
+		}
+	}
+	else
+	{
+		ScreenWithMenuElements::HandleScreenMessage(SM);
+	}
 }
 
 void ScreenMapControllers::HandleMessage( const Message &msg )
@@ -447,9 +691,78 @@ void ScreenMapControllers::HandleMessage( const Message &msg )
 	ScreenWithMenuElements::HandleMessage( msg );
 }
 
+void ScreenMapControllers::ClearToDefault()
+{
+	INPUTMAPPER->ResetMappingsToDefault();
+}
+
+void ScreenMapControllers::ReloadFromDisk()
+{
+	INPUTMAPPER->ReadMappingsFromDisk();
+}
+
+void ScreenMapControllers::SaveToDisk()
+{
+	INPUTMAPPER->SaveMappingsToDisk();
+	m_ChangeOccurred= false;
+}
+
+void ScreenMapControllers::SetListMode()
+{
+	if(m_SetList.size() < 1)
+	{
+		m_NoSetListPrompt->PlayCommand("TweenOn");
+		m_AutoDismissNoSetListPromptSecs= THEME->GetMetricF(m_sName, "AutoDismissNoSetListPromptSecs");
+	}
+	else
+	{
+		m_SetListCurrent= m_SetList.begin();
+		m_InSetListMode= true;
+		BeforeChangeFocus();
+		SetCursorFromSetListCurrent();
+		AfterChangeFocus();
+		StartWaitingForPress();
+	}
+}
+
+void ScreenMapControllers::ExitAction()
+{
+	if(m_ChangeOccurred)
+	{
+		ScreenPrompt::Prompt(SM_DoSaveAndExit, SAVE_PROMPT, PROMPT_YES_NO_CANCEL,
+			ANSWER_YES);
+	}
+	else
+	{
+		SCREENMAN->PlayStartSound();
+		StartTransitioningScreen(SM_GoToNextScreen);
+	}
+}
+
+void ScreenMapControllers::ActionRow::Load(RString const& scr_name,
+	RString const& name, ScreenMapControllers::action_fun_t action,
+	ActorFrame* line, ActorScroller* scroller)
+{
+	m_action= action;
+	RString lower_name= name;
+	lower_name.MakeLower();
+	// Make the specific actor optional, use a fallback if it doesn't exist.
+	RString path= THEME->GetPathG(scr_name, lower_name, true);
+	if(path.empty())
+	{
+		path= THEME->GetPathG(scr_name, "action");
+	}
+	m_actor.Load(path);
+	m_actor->SetName(name);
+	ActorUtil::LoadAllCommands(*m_actor, scr_name);
+	line->AddChild(m_actor);
+	scroller->AddChild(line);
+}
+
 
 /*
  * (c) 2001-2005 Chris Danford, Glenn Maynard
+ * 2014 Eric Reese
  * All rights reserved.
  * 
  * Permission is hereby granted, free of charge, to any person obtaining a
diff --git a/src/ScreenMapControllers.h b/src/ScreenMapControllers.h
index 5b36e933fe..ec83d89b2c 100644
--- a/src/ScreenMapControllers.h
+++ b/src/ScreenMapControllers.h
@@ -13,23 +13,38 @@ class ScreenMapControllers : public ScreenWithMenuElements
 {
 public:
 	ScreenMapControllers();
+	~ScreenMapControllers();
 	virtual void Init();
 	virtual void BeginScreen();
 
 	virtual void Update( float fDeltaTime );
 	virtual bool Input( const InputEventPlus &input );
+	virtual void HandleMessage( const Message &msg );
+	virtual void HandleScreenMessage( const ScreenMessage SM );
 
 private:
-	virtual void HandleMessage( const Message &msg );
 
 	Actor *GetActorWithFocus();
 	void BeforeChangeFocus();
 	void AfterChangeFocus();
 	void Refresh();
+	void DismissWarning();
+	bool CursorOnAction();
+	bool CursorOnHeader();
+	bool CursorOnKey();
+	bool CursorCanGoUp();
+	bool CursorCanGoDown();
+	int CurKeyIndex();
+	int CurActionIndex();
+	void SetCursorFromSetListCurrent();
+	void StartWaitingForPress();
 	
 	int m_iCurController;
 	int m_iCurButton;
 	int m_iCurSlot;
+	int m_MaxDestItem;
+
+	bool m_ChangeOccurred;
 
 	RageTimer m_WaitingForPress;
 	DeviceInput m_DeviceIToMap;
@@ -46,10 +61,58 @@ private:
 	BitmapText m_textDevices;
 
 	BitmapText m_textLabel[NUM_GameController];
+	BitmapText m_headerCenter;
+	BitmapText m_headerLabels[NUM_GameController][NUM_SHOWN_GAME_TO_DEVICE_SLOTS];
 
-	AutoActor m_sprExit;
+	float m_AutoDismissWarningSecs;
+	AutoActor m_sprWarning;
 
-	ActorFrame	m_Line[NUM_GameButton+2]; // label, normal lines, exit
+	float m_AutoDismissNoSetListPromptSecs;
+	AutoActor m_NoSetListPrompt;
+
+	struct SetListEntry
+	{
+		int m_button;
+		int m_controller;
+		int m_slot;
+		SetListEntry(int b, int c, int s)
+			:m_button(b), m_controller(c), m_slot(s) {}
+		bool operator<(SetListEntry const& rhs) const
+		{
+			if(m_controller != rhs.m_controller)
+			{
+				return m_controller < rhs.m_controller;
+			}
+			if(m_button != rhs.m_button)
+			{
+				return m_button < rhs.m_button;
+			}
+			return m_slot < rhs.m_slot;
+		}
+	};
+	set<SetListEntry> m_SetList;
+	set<SetListEntry>::iterator m_SetListCurrent;
+	bool m_InSetListMode;
+
+	typedef void (ScreenMapControllers::* action_fun_t)();
+	struct ActionRow
+	{
+		RString m_name;
+		AutoActor m_actor;
+		action_fun_t m_action;
+		void Load(RString const& scr_name, RString const& name,
+			ScreenMapControllers::action_fun_t action, ActorFrame* line,
+			ActorScroller* scroller);
+	};
+	void ClearToDefault();
+	void ReloadFromDisk();
+	void SaveToDisk();
+	void SetListMode();
+	void ExitAction();
+
+	vector<ActionRow> m_Actions;
+
+	vector<ActorFrame*> m_Line;
 	ActorScroller m_LineScroller;
 
 	RageSound m_soundChange;
@@ -60,6 +123,7 @@ private:
 
 /*
  * (c) 2001-2004 Chris Danford
+ * 2014 Eric Reese
  * All rights reserved.
  * 
  * Permission is hereby granted, free of charge, to any person obtaining a
diff --git a/src/ScreenMapControllers2.cpp b/src/ScreenMapControllers2.cpp
deleted file mode 100644
index 2d85c68840..0000000000
--- a/src/ScreenMapControllers2.cpp
+++ /dev/null
@@ -1,532 +0,0 @@
-#include "global.h"
-#include "ScreenMapControllers2.h"
-#include "ScreenManager.h"
-#include "RageLog.h"
-#include "GameState.h"
-#include "RageInput.h"
-#include "InputMapper.h"
-#include "ThemeManager.h"
-#include "ScreenDimensions.h"
-#include "InputEventPlus.h"
-#include "LocalizedString.h"
-#include "Foreach.h"
-#include "LuaBinding.h"
-
-static const float g_fSecondsToWaitForInput = 0.05f;
-
-static const char *MapControlsStateNames[] = {
-	"SelectingButton",
-	"EditingMappings"
-};
-XToString( MapControlsState );
-LuaXType( MapControlsState );
-
-REGISTER_SCREEN_CLASS( ScreenMapControllers2 );
-
-ScreenMapControllers2::ScreenMapControllers2()
-{
-	this->SubscribeToMessage( Message_AutoJoyMappingApplied );
-	m_MapControlsState = MCS_Button;
-	m_EditingButton = GAME_BUTTON_MENULEFT;
-	ZERO( m_iMappingChoice );
-	ZERO( m_iNumMappingRows );
-}
-
-static LocalizedString ADD_MAPPING( "ScreenMapControllers2", "Add Mapping" );
-void ScreenMapControllers2::Init()
-{
-	ScreenWithMenuElements::Init();
-
-	// load sounds
-	m_soundChange.Load( THEME->GetPathS(m_sName,"change"), true );
-	m_soundDelete.Load( THEME->GetPathS(m_sName,"delete"), true );
-
-	// set devices text
-	m_textDevices.LoadFromFont( THEME->GetPathF(m_sName,"devices") );
-	m_textDevices.SetName( "Devices" );
-	LOAD_ALL_COMMANDS_AND_SET_XY( m_textDevices );
-	this->AddChild( &m_textDevices );
-
-	// button input scroller
-	WRAP_INPUT_SCROLLER.Load( m_sName, "WrapInputScroller" );
-	LOOP_INPUT_SCROLLER.Load( m_sName, "LoopInputScroller" );
-	INPUT_SCROLLER_SECONDS_PER_ITEM.Load( m_sName, "InputScrollerSecondsPerItem" );
-	INPUT_SCROLLER_NUM_ITEMS_TO_DRAW.Load( m_sName, "InputScrollerNumItemsToDraw" );
-	INPUT_SCROLLER_TRANSFORM.Load( m_sName, "InputScrollerTransform" );
-	INPUT_SCROLLER_SUBDIVISIONS.Load( m_sName, "InputScrollerSubdivisions" );
-
-	// map all buttons for this game. (todo: re-add BUTTONS_TO_MAP support?)
-	FOREACH_GameButtonInScheme( INPUTMAPPER->GetInputScheme(), gb )
-	{
-		KeyToMap k;
-		k.m_GameButton = gb;
-		m_KeysToMap.push_back( k );
-	}
-
-	// input button names
-	int iRow = 0;
-	for( unsigned b=0; b<m_KeysToMap.size(); b++ )
-	{
-		KeyToMap *pKey = &m_KeysToMap[b];
-		{
-			BitmapText *pName = new BitmapText;
-			pName->SetName( "ButtonName" );
-			pName->LoadFromFont( THEME->GetPathF(m_sName,"ButtonName") );
-			RString sText = GameButtonToLocalizedString( INPUTMAPPER->GetInputScheme(), pKey->m_GameButton );
-			pName->SetText( sText );
-			ActorUtil::LoadAllCommands( *pName, m_sName );
-			pName->PlayCommand( b == (unsigned)m_iInputChoice ? "GainFocus" : "LoseFocus" );
-			m_InputLine[iRow].AddChild( pName );
-		}
-
-		m_InputLine[iRow].DeleteChildrenWhenDone();
-		m_InputLine[iRow].SetName( "InputLine" );
-		ActorUtil::LoadAllCommands( m_InputLine[iRow], m_sName );
-		m_InputScroller.AddChild( &m_InputLine[iRow] );
-
-		iRow++;
-	}
-
-	m_InputScroller.SetName( "InputScroller" );
-	LOAD_ALL_COMMANDS_AND_SET_XY( m_InputScroller );
-	m_InputScroller.SetLoop( LOOP_INPUT_SCROLLER );
-	m_InputScroller.SetNumItemsToDraw( INPUT_SCROLLER_NUM_ITEMS_TO_DRAW );
-	m_InputScroller.Load2();
-	m_InputScroller.SetTransformFromReference( INPUT_SCROLLER_TRANSFORM );
-	m_InputScroller.SetSecondsPerItem( INPUT_SCROLLER_SECONDS_PER_ITEM );
-	m_InputScroller.SetNumSubdivisions( INPUT_SCROLLER_SUBDIVISIONS );
-	this->AddChild( &m_InputScroller );
-
-	// set player scrollers:
-	vector<PlayerNumber> vpns;
-	FOREACH_PlayerNumber( p )
-		vpns.push_back( p );
-
-	// per-player mappings
-	WRAP_MAPPING_SCROLLER.Load( m_sName, "WrapMappingScroller" );
-	LOOP_MAPPING_SCROLLER.Load( m_sName, "LoopMappingScroller" );
-	MAPPING_SCROLLER_SECONDS_PER_ITEM.Load( m_sName, "MappingScrollerSecondsPerItem" );
-	MAPPING_SCROLLER_NUM_ITEMS_TO_DRAW.Load( m_sName, "MappingScrollerNumItemsToDraw" );
-	MAPPING_SCROLLER_TRANSFORM.Load( m_sName, "MappingScrollerTransform" );
-	MAPPING_SCROLLER_SUBDIVISIONS.Load( m_sName, "MappingScrollerSubdivisions" );
-
-	FOREACH( PlayerNumber, vpns, p )
-	{
-		// mapping scroller
-		m_MappingScroller[*p].SetLoop( LOOP_MAPPING_SCROLLER );
-		m_MappingScroller[*p].SetNumItemsToDraw( MAPPING_SCROLLER_NUM_ITEMS_TO_DRAW );
-		m_MappingScroller[*p].Load2();
-		m_MappingScroller[*p].SetTransformFromReference( MAPPING_SCROLLER_TRANSFORM );
-		m_MappingScroller[*p].SetSecondsPerItem( MAPPING_SCROLLER_SECONDS_PER_ITEM );
-		m_MappingScroller[*p].SetNumSubdivisions( MAPPING_SCROLLER_SUBDIVISIONS );
-		m_MappingScroller[*p].SetName( "MappingScroller"+ssprintf("P%d",(*p)+1) );
-		LOAD_ALL_COMMANDS_AND_SET_XY( m_MappingScroller[*p] );
-		this->AddChild( &m_MappingScroller[*p] );
-	}
-}
-
-void ScreenMapControllers2::BeginScreen()
-{
-	m_iInputChoice = 0;
-	m_ActivePlayerMapping = PLAYER_1;
-
-	ScreenWithMenuElements::BeginScreen();
-
-	m_WaitingForPress.SetZero();
-
-	Refresh();
-}
-
-void ScreenMapControllers2::Update( float fDeltaTime )
-{
-	ScreenWithMenuElements::Update( fDeltaTime );
-
-	// Update devices text
-	m_textDevices.SetText( INPUTMAN->GetDisplayDevicesString() );
-
-	if( !m_WaitingForPress.IsZero() && m_DeviceIToMap.IsValid() )
-	{
-		// we're going to map an input
-		if( m_WaitingForPress.PeekDeltaTime() < g_fSecondsToWaitForInput )
-			return; // keep waiting
-		m_WaitingForPress.SetZero();
-
-		/* do stuff here */
-		//ASSERT( m_iCurButton < (int) m_KeysToMap.size() );
-		//const KeyToMap *pKey = &m_KeysToMap[m_iCurButton];
-		//GameInput curGameI( (GameController)m_iCurController, pKey->m_GameButton );
-		//INPUTMAPPER->SetInputMap( m_DeviceIToMap, curGameI, m_iCurSlot );
-		//INPUTMAPPER->AddDefaultMappingsForCurrentGameIfUnmapped();
-
-		// commit to disk after each change
-		//INPUTMAPPER->SaveMappingsToDisk();
-
-		Refresh();
-
-		/*
-		BitmapText *pText = pKey->m_textMappedTo[m_iCurController][m_iCurSlot];
-		pText->PlayCommand( "MappedInput" );
-		*/
-		SCREENMAN->PlayStartSound();
-	}
-}
-
-
-/* Note that this isn't necessarily correct. For example, JOY_LEFT might
- * actually be a D-pad and not an axis. All this is actually doing is giving
- * priority to some inputs over others; this function is unsuitable for other use. */
-static bool IsAxis( const DeviceInput& DeviceI )
-{
-	if( !DeviceI.IsJoystick() )
-		return false;
-
-	static int axes[] = 
-	{
-		JOY_LEFT, JOY_RIGHT, JOY_UP, JOY_DOWN,
-		JOY_LEFT_2, JOY_RIGHT_2, JOY_UP_2, JOY_DOWN_2,
-		JOY_Z_UP, JOY_Z_DOWN,
-		JOY_ROT_UP, JOY_ROT_DOWN, JOY_ROT_LEFT, JOY_ROT_RIGHT, JOY_ROT_Z_UP, JOY_ROT_Z_DOWN,
-		JOY_HAT_LEFT, JOY_HAT_RIGHT, JOY_HAT_UP, JOY_HAT_DOWN, 
-		JOY_AUX_1, JOY_AUX_2, JOY_AUX_3, JOY_AUX_4,
-		-1
-	};
-
-	for( int ax = 0; axes[ax] != -1; ++ax )
-		if( DeviceI.button == axes[ax] )
-			return true;
-
-	return false;
-}
-
-void ScreenMapControllers2::ChangeActivePlayer()
-{
-	m_ActivePlayerMapping = (m_ActivePlayerMapping == PLAYER_1) ? PLAYER_2 : PLAYER_1;
-	Message msg("ActivePlayerChanged");
-	msg.SetParam("NewActivePlayer",m_ActivePlayerMapping);
-	MESSAGEMAN->Broadcast(msg);
-}
-
-void ScreenMapControllers2::Input( const InputEventPlus &input )
-{
-	if( input.type != IET_FIRST_PRESS && input.type != IET_REPEAT )
-		return;	// ignore
-	if( IsTransitioning() )
-		return;	// ignore
-
-	LOG->Trace( "ScreenMapControllers2::Input():  device: %d, button: %d", 
-		input.DeviceI.device, input.DeviceI.button );
-
-	int button = input.DeviceI.button;
-
-	/* TRICKY: Some adapters map the PlayStation digital d-pad to both axes and
-	 * buttons. We want buttons to be used for any mappings where possible
-	 * because presses of buttons aren't mutually exclusive and presses of axes
-	 * are (e.g. can't read presses of both Left and Right simultaneously). So,
-	 * when the user presses a button, we'll wait until the next Update before
-	 * adding a mapping so that we get a chance to see all input events the 
-	 * user's press of a panel. Prefer non-axis events over axis events. */
-	if( !m_WaitingForPress.IsZero() )
-	{
-		if( input.type != IET_FIRST_PRESS )
-			return;
-
-		// Don't allow function keys to be mapped.
-		if( input.DeviceI.device == DEVICE_KEYBOARD && (input.DeviceI.button >= KEY_F1 && input.DeviceI.button <= KEY_F12) )
-		{
-			SCREENMAN->SystemMessage( "INVALID_BUTTON" );
-			SCREENMAN->PlayInvalidSound();
-		}
-		else
-		{
-			if( m_DeviceIToMap.IsValid() &&
-				!IsAxis(m_DeviceIToMap) &&
-				IsAxis(input.DeviceI) )
-			{
-				LOG->Trace("Ignored input; non-axis event already received");
-				return;	// ignore this press
-			}
-
-			m_DeviceIToMap = input.DeviceI;
-		}
-	}
-	else if( input.DeviceI.device == DEVICE_KEYBOARD )
-	{
-		switch( button )
-		{
-			// todo: m_MapControlsState checks
-			case KEY_UP: // mapping list up
-				{
-					if( m_MapControlsState == MCS_EditMappings )
-					{
-						if( m_iMappingChoice[m_ActivePlayerMapping] == 0 )
-							break;
-						m_iMappingChoice[m_ActivePlayerMapping]--;
-					}
-				}
-				break;
-			case KEY_DOWN: // mapping list down
-				{
-					if( m_MapControlsState == MCS_EditMappings )
-					{
-						if( m_iMappingChoice[m_ActivePlayerMapping] == m_iNumMappingRows[m_ActivePlayerMapping] )
-							break;
-						m_iMappingChoice[m_ActivePlayerMapping]++;
-					}
-				}
-				break;
-			case KEY_LEFT: // on P2, changing to P1
-				{
-					if( m_MapControlsState == MCS_EditMappings )
-					{
-						if(m_ActivePlayerMapping == PLAYER_2)
-							ChangeActivePlayer();
-					}
-				}
-				break;
-			case KEY_RIGHT: // on P1, changing to P2
-				{
-					if( m_MapControlsState == MCS_EditMappings )
-					{
-						if(m_ActivePlayerMapping == PLAYER_1)
-							ChangeActivePlayer();
-					}
-				}
-				break;
-			case KEY_DEL:
-			case KEY_BACK:
-				if( m_MapControlsState == MCS_EditMappings )
-				{
-					// clear mapping
-					/*
-					if( m_iMappingChoice[m_ActivePlayerMapping] == m_iNumMappingRows[m_ActivePlayerMapping] )
-						break; // on "add"
-
-					{
-						// stuff
-
-						m_soundDelete.Play();
-
-						// commit to disk after each change
-						INPUTMAPPER->SaveMappingsToDisk();
-					}
-					*/
-				}
-				break;
-			case KEY_ESC:
-				{
-					if(m_MapControlsState == MCS_EditMappings)
-					{
-						// xxx: make sure it's not getting a button.
-						m_MapControlsState = MCS_Button;
-						SCREENMAN->PlayCancelSound();
-					}
-					else
-					{
-						// Quit the screen.
-						SCREENMAN->PlayStartSound();
-						StartTransitioningScreen( SM_GoToNextScreen );
-					}
-				}
-				break;
-			case KEY_ENTER:
-			case KEY_KP_ENTER:
-				{
-					if( m_MapControlsState == MCS_EditMappings )
-					{
-						// map button
-						LOG->Trace("got an enter press...");
-						LOG->Trace( ssprintf("current choice: %i",m_iMappingChoice[m_ActivePlayerMapping]) );
-						if( m_iMappingChoice[m_ActivePlayerMapping] == m_iNumMappingRows[m_ActivePlayerMapping] )
-						{
-							// add
-							LOG->Trace("Adding a new mapping");
-						}
-						else
-						{
-							// replace
-							LOG->Trace("Replacing an existing mapping");
-						}
-						/*
-						m_WaitingForPress.Touch();
-						m_DeviceIToMap.MakeInvalid();
-						SCREENMAN->PlayStartSound();
-						*/
-					}
-				}
-				break;
-		}
-	}
-
-	ScreenWithMenuElements::Input( input );	// default handler
-
-	Refresh();
-}
-
-void ScreenMapControllers2::Refresh()
-{
-	// update mapping scrollers
-	UpdateMappingScrollers();
-}
-
-void ScreenMapControllers2::HandleMessage( const Message &msg )
-{
-	if( msg == Message_AutoJoyMappingApplied )
-	{
-		Refresh();
-	}
-
-	ScreenWithMenuElements::HandleMessage( msg );
-}
-
-void ScreenMapControllers2::MenuStart( const InputEventPlus &input )
-{
-	// MCS_EditMappings is handled in Input() above.
-	if( m_MapControlsState == MCS_Button )
-	{
-		m_MapControlsState = MCS_EditMappings;
-	}
-}
-
-void ScreenMapControllers2::UpdateMappingScrollers()
-{
-	FOREACH_ENUM( GameController,  c )
-	{
-		PlayerNumber pn = (PlayerNumber)c;
-		m_MappingScroller[pn].RemoveAllChildren();
-
-		int iLast = 0;
-		for(unsigned s = 0; s < NUM_SHOWN_GAME_TO_DEVICE_SLOTS; s++)
-		{
-			GameInput cur_gi( c, m_EditingButton );
-			DeviceInput di;
-			RString sInput = "";
-			if( INPUTMAPPER->GameToDevice( cur_gi, s, di ) )
-				sInput = INPUTMAN->GetDeviceSpecificInputString(di);
-
-			if( sInput != "" )
-			{
-				m_MappingLine[iLast].RemoveAllChildren();
-				// we have an input, add to the scroller
-				BitmapText *pText = new BitmapText;
-				pText->SetName( "MappedTo"+PlayerNumberToString(pn) );
-				pText->LoadFromFont( THEME->GetPathF(m_sName,"Mapping") );
-				ActorUtil::LoadAllCommands(pText,m_sName);
-				pText->PlayCommand( ((unsigned)m_iMappingChoice[pn] == s) ? "GainFocus" : "LoseFocus" );
-				pText->SetText( sInput );
-
-				m_MappingLine[iLast].AddChild( pText );
-				m_MappingLine[iLast].DeleteChildrenWhenDone();
-				m_MappingLine[iLast].SetName("MappingLine");
-				ActorUtil::LoadAllCommands(m_MappingLine[iLast],m_sName);
-				m_MappingScroller[pn].AddChild( &m_MappingLine[iLast] );
-				iLast++;
-			}
-		}
-
-		BitmapText &text = m_textAddMapping[pn];
-		text.LoadFromFont( THEME->GetPathF(m_sName,"AddMapping") );
-		text.SetName( "AddMapping"+PlayerNumberToString(pn) );
-		ActorUtil::LoadAllCommands( text, m_sName );
-		text.PlayCommand( (m_iMappingChoice[pn] == m_iNumMappingRows[pn]) ? "GainFocus" : "LoseFocus" );
-		text.SetText( ADD_MAPPING );
-		m_MappingScroller[pn].AddChild( &m_textAddMapping[c] );
-		iLast++;
-
-		m_iNumMappingRows[pn] = iLast;
-
-		m_MappingScroller[pn].Load2();
-		m_MappingScroller[pn].SetTransformFromReference( MAPPING_SCROLLER_TRANSFORM );
-		m_MappingScroller[pn].SetCurrentAndDestinationItem( (float)m_iMappingChoice[pn] );
-	}
-}
-
-// change game/system button scroller selection
-void ScreenMapControllers2::ChangeInputSelection(int iDir)
-{
-	m_InputLine[m_iInputChoice].PlayCommand("LoseFocus");
-	m_iInputChoice += iDir;
-	m_soundChange.Play();
-	m_InputLine[m_iInputChoice].PlayCommand("GainFocus");
-
-	// set scroller
-	m_InputScroller.SetCurrentAndDestinationItem( (float)m_iInputChoice );
-
-	// set current game button
-	KeyToMap *pKey = &m_KeysToMap[m_iInputChoice];
-	m_EditingButton = pKey->m_GameButton;
-}
-
-void ScreenMapControllers2::MenuUp( const InputEventPlus &input )
-{
-	if( m_MapControlsState == MCS_Button )
-	{
-		if( m_iInputChoice == 0 ) // limit
-			return;
-		ChangeInputSelection(-1);
-	}
-}
-
-void ScreenMapControllers2::MenuDown( const InputEventPlus &input )
-{
-	if( m_MapControlsState == MCS_Button )
-	{
-		if( m_iInputChoice == (int)m_KeysToMap.size()-1 ) // limit
-			return;
-		ChangeInputSelection(1);
-	}
-}
-
-void ScreenMapControllers2::TweenOnScreen()
-{
-	ScreenWithMenuElements::TweenOnScreen();
-
-	m_InputScroller.SetCurrentAndDestinationItem( (float)m_iInputChoice );
-}
-
-// lua start
-#include "LuaBinding.h"
-
-/** @brief Allow Lua to have access to ScreenMapControllers2. */ 
-class LunaScreenMapControllers2: public Luna<ScreenMapControllers2>
-{
-public:
-	//static int MapControlsState( T* p, lua_State *L ) //
-	//static int GetEditingGameButton( T* p, lua_State *L ) // GetEditingGameButton()
-	DEFINE_METHOD( GetInputIndex, GetInputIndex() );
-	DEFINE_METHOD( GetNumInputs, GetNumInputs() );
-	LunaScreenMapControllers2()
-	{
-		//ADD_METHOD( GetEditingGameButton );
-		ADD_METHOD( GetInputIndex );
-		ADD_METHOD( GetNumInputs );
-		//ADD_METHOD( MapControlsState );
-	}
-};
-
-LUA_REGISTER_DERIVED_CLASS( ScreenMapControllers2, ScreenWithMenuElements )
-
-
-/*
- * (c) 2011 AJ Kelly
- * All rights reserved.
- * 
- * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of this software and associated documentation files (the
- * "Software"), to deal in the Software without restriction, including
- * without limitation the rights to use, copy, modify, merge, publish,
- * distribute, and/or sell copies of the Software, and to permit persons to
- * whom the Software is furnished to do so, provided that the above
- * copyright notice(s) and this permission notice appear in all copies of
- * the Software and that both the above copyright notice(s) and this
- * permission notice appear in supporting documentation.
- * 
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
- * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF
- * THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS
- * INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT
- * OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS
- * OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR
- * OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
- * PERFORMANCE OF THIS SOFTWARE.
- */
diff --git a/src/ScreenMapControllers2.h b/src/ScreenMapControllers2.h
deleted file mode 100644
index 87c76a1c74..0000000000
--- a/src/ScreenMapControllers2.h
+++ /dev/null
@@ -1,136 +0,0 @@
-/* ScreenMapControllers2 - Maps device input to game buttons. */
-
-#ifndef SCREEN_MAP_CONTROLLERS2_H
-#define SCREEN_MAP_CONTROLLERS2_H
-
-#include "ScreenWithMenuElements.h"
-#include "BitmapText.h"
-#include "InputMapper.h"
-#include "ActorScroller.h"
-#include "RageSound.h"
-#include "EnumHelper.h"
-#include "ThemeMetric.h"
-
-/* old inputmapper consts:
-const int NUM_GAME_TO_DEVICE_SLOTS	= 5;	// five device inputs may map to one game input
-const int NUM_SHOWN_GAME_TO_DEVICE_SLOTS = 3;
-const int NUM_USER_GAME_TO_DEVICE_SLOTS = 2;
-*/
-const int MAPPING_LINE = NUM_SHOWN_GAME_TO_DEVICE_SLOTS+1; // +1 for "Add Mapping"
-
-enum MapControlsState
-{
-	MCS_Button,		// which button to edit mappings for
-	MCS_EditMappings,		// player is editing mappings
-	NUM_MapControlsState,
-	MapControlsState_Invalid
-};
-const RString& MapControlsStateToString( MapControlsState mct );
-LuaDeclareType( MapControlsState );
-
-class ScreenMapControllers2 : public ScreenWithMenuElements
-{
-public:
-	ScreenMapControllers2();
-	virtual void Init();
-	virtual void BeginScreen();
-	//virtual void EndScreen();
-
-	virtual void Update( float fDeltaTime );
-	virtual bool Input( const InputEventPlus &input );
-
-	virtual bool MenuUp( const InputEventPlus &input );
-	virtual bool MenuDown( const InputEventPlus &input );
-	virtual bool MenuStart( const InputEventPlus &input );
-	virtual void TweenOnScreen();
-
-	MapControlsState GetMapControlsState(){ return m_MapControlsState; }
-	GameButton GetEditingGameButton() { return m_EditingButton; }
-	int GetInputIndex(){ return m_iInputChoice; }
-	int GetNumInputs(){ return m_KeysToMap.size(); }
-	int GetMappingIndex(PlayerNumber pn){ return m_iMappingChoice[pn]; }
-
-	// Lua
-	virtual void PushSelf( lua_State *L );
-
-protected:
-	virtual void HandleMessage( const Message &msg );
-
-	void ChangeActivePlayer();
-	void ChangeInputSelection(int iDir);
-	void UpdateMappingScrollers();
-	void Refresh();
-
-	MapControlsState m_MapControlsState;
-	RageTimer m_WaitingForPress;
-	DeviceInput m_DeviceIToMap;
-
-	struct KeyToMap
-	{
-		GameButton	m_GameButton;
-		BitmapText*	m_textLabel;
-	};
-	vector<KeyToMap> m_KeysToMap;
-
-	BitmapText m_textDevices;
-	//vector<BitmapText> m_textMappingLabels[NUM_PLAYERS];
-	BitmapText m_textAddMapping[NUM_PLAYERS];
-
-	// possible inputs
-	int m_iInputChoice;
-	ActorScroller	m_InputScroller;
-	ActorFrame	m_InputLine[NUM_GameButton];
-	ThemeMetric<bool>	WRAP_INPUT_SCROLLER;
-	ThemeMetric<bool>	LOOP_INPUT_SCROLLER;
-	ThemeMetric<float>	INPUT_SCROLLER_SECONDS_PER_ITEM;
-	ThemeMetric<float>	INPUT_SCROLLER_NUM_ITEMS_TO_DRAW;
-	ThemeMetric<LuaReference> INPUT_SCROLLER_TRANSFORM;
-	ThemeMetric<int>	INPUT_SCROLLER_SUBDIVISIONS;
-
-	// per-player button mappings.
-	GameButton m_EditingButton;
-	PlayerNumber m_ActivePlayerMapping;
-	int m_iMappingChoice[NUM_PLAYERS];
-	int m_iNumMappingRows[NUM_PLAYERS];
-	ActorScroller	m_MappingScroller[NUM_PLAYERS];
-	ActorFrame	m_MappingLine[MAPPING_LINE];
-	ThemeMetric<bool>	WRAP_MAPPING_SCROLLER;
-	ThemeMetric<bool>	LOOP_MAPPING_SCROLLER;
-	ThemeMetric<float>	MAPPING_SCROLLER_SECONDS_PER_ITEM;
-	ThemeMetric<float>	MAPPING_SCROLLER_NUM_ITEMS_TO_DRAW;
-	ThemeMetric<LuaReference> MAPPING_SCROLLER_TRANSFORM;
-	ThemeMetric<int>	MAPPING_SCROLLER_SUBDIVISIONS;
-
-	// should be handled in lua
-	//BitmapText m_textLabel[NUM_GameController];
-
-	RageSound m_soundChange;
-	RageSound m_soundDelete;
-};
-
-#endif
-
-/*
- * (c) 2011 AJ Kelly
- * All rights reserved.
- * 
- * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of this software and associated documentation files (the
- * "Software"), to deal in the Software without restriction, including
- * without limitation the rights to use, copy, modify, merge, publish,
- * distribute, and/or sell copies of the Software, and to permit persons to
- * whom the Software is furnished to do so, provided that the above
- * copyright notice(s) and this permission notice appear in all copies of
- * the Software and that both the above copyright notice(s) and this
- * permission notice appear in supporting documentation.
- * 
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
- * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF
- * THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS
- * INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT
- * OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS
- * OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR
- * OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
- * PERFORMANCE OF THIS SOFTWARE.
- */

From b89bc651782277f64e8c1e45e1967b4c5adc27ea Mon Sep 17 00:00:00 2001
From: Colby Klein <shakesoda@gmail.com>
Date: Tue, 2 Sep 2014 06:06:08 -0700
Subject: [PATCH 21/24] Change ES/OMES to 2x, extend timer on ScreenCaution

Also, changed indent style in .editorconfig to spaces  for txt files, to
reduce diff noise.
---
 .editorconfig                |  3 +++
 Docs/Changelog_sm5.txt       | 16 ++++++++++------
 Themes/_fallback/metrics.ini | 20 +++++++++++---------
 3 files changed, 24 insertions(+), 15 deletions(-)

diff --git a/.editorconfig b/.editorconfig
index 2b76bd4c68..3a4332d763 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -9,6 +9,9 @@ charset = utf-8
 trim_trailing_whitespace = true
 insert_final_newline = true
 
+[*.txt]
+indent_style = space
+
 [*.md]
 trim_trailing_whitespace = false
 
diff --git a/Docs/Changelog_sm5.txt b/Docs/Changelog_sm5.txt
index a8cf1eb9b6..ab7ae50ff4 100644
--- a/Docs/Changelog_sm5.txt
+++ b/Docs/Changelog_sm5.txt
@@ -1,4 +1,4 @@
-StepMania 5 Changelog
+StepMania 5 Changelog
 ________________________________________________________________________________
 The StepMania 5 Changelog covers all post-sm-ssc changes. For a list of changes
 from StepMania 4 alpha 5 to sm-ssc v1.2.5, see Changelog_sm-ssc.txt.
@@ -8,6 +8,10 @@ ________________________________________________________________________________
 StepMania current development
 --------------------------------------------------------------------------------
 
+2014/09/02
+----------
+* Changed ES/OMES speed mod to 2x from 1.5x.
+
 2014/08/06
 ----------
 * [ScreenGameplay] LifeMeterChangedP1 message is no longer broadcast for for
@@ -582,7 +586,7 @@ StepMania 5.0 alpha 1 | 20120108
 * [ScreenManager] Made AddScreenToTop take a second (optional) parameter for
   posting a ScreenMessage on screen pop. [AJ]
 * Only read certain tags during first load; makes song loading faster. [theDtTvB]
-  
+
 2012/01/07
 ----------
 * Fix Portable.ini not working on Mac OS X. [shakesoda]
@@ -691,8 +695,8 @@ StepMania 5.0 alpha 1 | 20120108
 2011/11/15
 ----------
 * [LifeMeterBar] Added the ForceLifeDifficultyOnExtraStage metric and
-  the ExtraStageLifeDifficulty metric. Let the themer decide if extra stages 
-  should have their own life bar behavior. Note that this metric does NOT 
+  the ExtraStageLifeDifficulty metric. Let the themer decide if extra stages
+  should have their own life bar behavior. Note that this metric does NOT
   change the lifebar to the battery style. [Wolfman2000/FSX]
 
 2011/11/14
@@ -1237,7 +1241,7 @@ StepMania 5.0 Preview 2 | 20110703
 2011/06/12
 ----------
 * [ScreenNetSelectMusic] Add PlayerOptionsScreen metric. [AJ]
-* [ScreenEdit] Restore the old PageUp/PageDown behavior, added Control + 
+* [ScreenEdit] Restore the old PageUp/PageDown behavior, added Control +
   PageUp/PageDown to use recent time signature behavior. Laptop users, that
   includes you guys too: semicolon and apostrophe are still good. [Wolfman2000]
 
@@ -1376,7 +1380,7 @@ StepMania 5.0 Preview 1 | 20110529
 ----------
 * [ScreenGameplay] Removed hardcoded commands for Debug (give up text) and
   replace them with DebugStartOnCommand, DebugBackOnCommand, and
-  DebugTweenOffCommand. [AJ] 
+  DebugTweenOffCommand. [AJ]
 * Added #SPEEDS to the SSC format. This multiplies your scrolling speed during
   gameplay, not replaces it (see mod attacks for replacing). [Wolfman2000]
 
diff --git a/Themes/_fallback/metrics.ini b/Themes/_fallback/metrics.ini
index 50299c88b9..a48624bbac 100644
--- a/Themes/_fallback/metrics.ini
+++ b/Themes/_fallback/metrics.ini
@@ -1,4 +1,4 @@
-# This probably is hard to understand from the way it was made in the first 
+# This probably is hard to understand from the way it was made in the first
 # place, so instead just pay attention to each group, which has tons of notes.
 
 # 01 # Global
@@ -68,7 +68,7 @@ PercentScoreDecimalPlaces=2
 # 02 #
 
 [LightsManager]
-# Mostly useless since it doesn't work, as well as that barely anyone has 
+# Mostly useless since it doesn't work, as well as that barely anyone has
 # lights to play around with.
 GameButtonsToShow=""
 # these metrics don't exist yet, but are planned:
@@ -83,9 +83,9 @@ NumFixedProfiles=1
 
 [SongManager]
 # SSC: Determine what the ES/OMES Modifiers are
-ExtraStagePlayerModifiers="default,1.5x,reverse"
+ExtraStagePlayerModifiers="default,2x,reverse"
 ExtraStageStageModifiers="failimmediatecontinue,norecover"
-OMESPlayerModifiers="default,1.5x,reverse"
+OMESPlayerModifiers="default,2x,reverse"
 OMESStageModifiers="failimmediate,suddendeath"
 
 # How many different colors you can have in the MusicWheel
@@ -175,10 +175,10 @@ UnlockNames=""
 # to use to store the unlock.
 # Unlock2Command=song,"ABC";code,"59183751";roulette
 
-# 03 # 
+# 03 #
 
 [ArrowEffects]
-# Complicated stuff you probably shouldn't ever mess with or else you'll 
+# Complicated stuff you probably shouldn't ever mess with or else you'll
 # destroy mods completely! It's unknown why these were made into metrics.
 FrameWidthEffectsPixelsPerSecond=400
 FrameWidthEffectsMinMultiplier=0.5
@@ -475,7 +475,7 @@ SortLevel4Color=color("1,1,0,1")
 SortLevel5Color=color("0,1,0,1")
 
 [CustomDifficulty]
-# Custom system that lets you rename certain classes of difficulties to 
+# Custom system that lets you rename certain classes of difficulties to
 # something else. Mostly for custom games and game emulation, PIU for example.
 
 #Names="PumpHard,PumpFreestyle,PumpNightmare"
@@ -858,7 +858,7 @@ RightY=12
 [MenuTimer]
 WarningStart=10
 WarningBeepStart=10
-# I don't like it 
+# I don't like it
 # -- Midiman
 # MaxStallSeconds=7.5
 MaxStallSeconds=0
@@ -1897,7 +1897,9 @@ Fallback="ScreenSplash"
 PrepareScreen=""
 NextScreen=Branch.StartGame()
 PrevScreen=Branch.TitleMenu()
-TimerSeconds=3
+TimerSeconds=10
+TimerStealth=true
+ForceTimer=true
 AllowStartToSkip=true
 
 [ScreenProfileLoad]

From 13066518feb9d31b286bfe4ba71d7203e20a72a7 Mon Sep 17 00:00:00 2001
From: Kyzentun <kyzentun@gmail.com>
Date: Thu, 4 Sep 2014 17:03:11 -0600
Subject: [PATCH 22/24] Renamed Header elements to ListHeader.  Removed
 hungarian notation from ScreenMapControllers.

---
 .../Example_Screens/ScreenMapControllers.lua  | 134 ++++++++++++++++++
 .../Graphics/ScreenMapControllers action.lua  |  16 +--
 Themes/_fallback/metrics.ini                  |  54 ++++---
 src/ScreenMapControllers.cpp                  | 105 +++++++-------
 src/ScreenMapControllers.h                    |  14 +-
 5 files changed, 238 insertions(+), 85 deletions(-)
 create mode 100644 Docs/Themerdocs/Examples/Example_Screens/ScreenMapControllers.lua

diff --git a/Docs/Themerdocs/Examples/Example_Screens/ScreenMapControllers.lua b/Docs/Themerdocs/Examples/Example_Screens/ScreenMapControllers.lua
new file mode 100644
index 0000000000..00cb0a0c5d
--- /dev/null
+++ b/Docs/Themerdocs/Examples/Example_Screens/ScreenMapControllers.lua
@@ -0,0 +1,134 @@
+-- This is the example for how to theme ScreenMapControllers, the Config
+-- Key/Joy Mappings screen.
+
+-- The contents of this file will actually be in several sections, each
+-- intended to be placed in its own file.
+-- Sections will be seperated by lines of dashes to make the separation clear.
+-- The first line inside the dashes will have the name of the file to copy the
+-- section to.
+-- The rest of the area inside the dashes will discuss general aspects of the
+-- section being discussed.
+
+
+----------------------------------------------------------------
+-- metrics.ini - the metrics you might want to set
+-- See the ScreenMapControllers section of _fallback/metrics.ini
+----------------------------------------------------------------
+
+----------------------------------------------------------------
+-- overlay, underlay, decorations, transitions
+-- ScreenMapControllers supports the standard layers and transitions:
+-- Layers:  overlay, underlay, decorations
+-- Transitions:  in, out, cancel
+-- Details of creating the layers and transitions for a screen are covered in
+-- ScreenWithLayersAndTransitions.lua.
+-- Previous versions of ScreenMapControllers had the warning in the overlay.
+-- The warning has been moved to Graphics/ScreenMapControllers warning.lua.  If
+-- you have previously made a theme, update your theme to match the new
+-- convention.
+----------------------------------------------------------------
+
+----------------------------------------------------------------
+-- Graphics/ScreenMapControllers warning.lua
+-- The warning that is displayed when entering the screen.
+-- The _fallback warning uses the WarningHeader and WarningText strings from
+-- en.ini.  If all you want to do is change the text, add those entries to your
+-- en.ini.
+-- The actor returned by your lua file must handle TweenOn and TweenOff commands.
+-- TweenOn will occur when the screen starts.
+-- TweenOff will occur when the warning is dismissed.
+-- Here is a simple actor that dims the screen and displays the text.
+----------------------------------------------------------------
+return Def.ActorFrame{
+	InitCommand=cmd(xy, SCREEN_CENTER_X, SCREEN_CENTER_Y),
+	Def.Quad{
+		TweenOnCommand=cmd(zoomto, SCREEN_WIDTH, SCREEN_HEIGHT; diffuse, Color.Black),
+		TweenOffCommand=cmd(linear, 0.5; diffusealpha, 0),
+	},
+	Def.BitmapText{
+		Font="Common Normal",
+		Text=ScreenString("WarningHeader"),
+		TweenOnCommand=cmd(y,-80;diffuse,Color.Red),
+		TweenOffCommand=cmd(linear,0.5;diffusealpha,0),
+		
+	},
+	Def.BitmapText{
+		Font="Common Normal",
+		Text=ScreenString("WarningText"),
+		TweenOnCommand=cmd(y,10;wrapwidthpixels,SCREEN_WIDTH-48),
+		TweenOffCommand=cmd(linear,0.5;diffusealpha,0),
+	},
+}
+
+----------------------------------------------------------------
+-- Graphics/ScreenMapControllers action.lua
+-- The fallback actor that is used when there isn't a specific actor for an
+-- action.  At a minimum, this should display the name of the action, in order
+-- to correctly handle the possibility of actions being added in the future.
+-- _fallback's version accomplishes this by being a BitmapText and fetching the
+-- text from en.ini.
+----------------------------------------------------------------
+return Def.BitmapText{
+	Font="Common Normal",
+	InitCommand= cmd(x, SCREEN_CENTER_X; zoom, .75; diffuse, color("#808080")),
+	OnCommand= function(self)
+		self:diffusealpha(0)
+		self:decelerate(0.5)
+		self:diffusealpha(1)
+		-- This code is in the OnCommand because the screen sets the name of this
+		-- actor after loading it.  If this code was in the InitCommand, it would
+		-- not work because the name is blank at that point.
+		-- fancy effect:  Look at the name (which is set by the screen) to set text
+		-- The name is concatenated with "Action" so that the strings used will be
+		-- unique, next to each other in the language file, and clear in usage.
+		self:settext(
+			THEME:GetString("ScreenMapControllers", "Action" .. self:GetName()))
+	end,
+	OffCommand=cmd(stoptweening;accelerate,0.3;diffusealpha,0;queuecommand,"Hide"),
+	HideCommand=cmd(visible,false),
+	GainFocusCommand=cmd(diffuseshift;effectcolor2,color("#808080");effectcolor1,color("#FFFFFF")),
+	LoseFocusCommand=cmd(stopeffect),
+}
+
+----------------------------------------------------------------
+-- Graphics/ScreenMapControllers <action name>.lua
+-- Every action can have its own special actor which will be used if it exists.
+-- Replace "<action name>" with the lowercase name of the action you are making
+-- an actor for and create the actor you want for that action.
+-- As of this writing, action names are:
+-- "clear", "reload", "save", "setlist", "exit"
+-- Creating actors is discussed in Examples/anatomy_of_an_actor.lua, so an
+-- example is not provided here.
+----------------------------------------------------------------
+
+----------------------------------------------------------------
+-- Graphics/ScreenMapControllers nosetlistprompt.lua
+-- This is the actor that is displayed when the player attempts to use the
+-- SetList (or "Assign List") action without anything in the list.
+-- It should tell the player that the list is empty and how to add things to
+-- the list.
+-- It must handle TweenOn and TweenOff commands.
+-- TweenOn occurs when the player tries to perform the action and fails.
+-- TweenOff occurs when the prompt is dismissed.
+-- _fallback's does this by dimming the screen with a quad and using a
+-- BitmapText to display the string from the language file.
+-- Note the use of stoptweening in TweenOn and TweenOff.  This is to prevent
+-- the player from overflowing the tween stack by mashing.
+----------------------------------------------------------------
+return Def.ActorFrame{
+	InitCommand=cmd(x,SCREEN_CENTER_X;y,SCREEN_CENTER_Y),
+	Def.Quad{
+		InitCommand=cmd(zoomto,SCREEN_WIDTH,SCREEN_HEIGHT;diffuse,Color.Black;diffusealpha,0),
+		TweenOnCommand=cmd(stoptweening;diffusealpha,1;linear,0.5;diffusealpha,0.8),
+		TweenOffCommand=cmd(stoptweening;linear,0.5;diffusealpha,0),
+	},
+	Def.ActorFrame{
+		Def.BitmapText{
+			Font="Common Normal",
+			Text=ScreenString("NoSetListPrompt"),
+			InitCommand=cmd(y,10;wrapwidthpixels,SCREEN_WIDTH-48;diffusealpha,0),
+			TweenOnCommand=cmd(stoptweening;diffusealpha,0;sleep,0.5125;linear,0.125;diffusealpha,1),
+			TweenOffCommand=cmd(stoptweening;linear,0.5;diffusealpha,0),
+		},
+	},
+}
diff --git a/Themes/_fallback/Graphics/ScreenMapControllers action.lua b/Themes/_fallback/Graphics/ScreenMapControllers action.lua
index 0ff5737aa3..406785aff4 100644
--- a/Themes/_fallback/Graphics/ScreenMapControllers action.lua	
+++ b/Themes/_fallback/Graphics/ScreenMapControllers action.lua	
@@ -1,5 +1,6 @@
-return LoadFont("Common Normal") .. {
-	InitCommand= cmd(x, SCREEN_CENTER_X; zoom, .75; shadowlength, 0; diffuse, color("#808080")),
+return Def.BitmapText{
+	Font="Common Normal",
+	InitCommand= cmd(x, SCREEN_CENTER_X; zoom, .75, 0; diffuse, color("#808080")),
 	OnCommand= function(self)
 		self:diffusealpha(0)
 		self:decelerate(0.5)
@@ -8,9 +9,8 @@ return LoadFont("Common Normal") .. {
 		self:settext(
 			THEME:GetString("ScreenMapControllers", "Action" .. self:GetName()))
 	end,
-	OffCommand=cmd(stoptweening;accelerate,0.3;diffusealpha,0;queuecommand,"Hide");
-	HideCommand=cmd(visible,false);
-
-	GainFocusCommand=cmd(diffuseshift;effectcolor2,color("#808080");effectcolor1,color("#FFFFFF"));
-	LoseFocusCommand=cmd(stopeffect);
-};
+	OffCommand=cmd(stoptweening;accelerate,0.3;diffusealpha,0;queuecommand,"Hide"),
+	HideCommand=cmd(visible,false),
+	GainFocusCommand=cmd(diffuseshift;effectcolor2,color("#808080");effectcolor1,color("#FFFFFF")),
+	LoseFocusCommand=cmd(stopeffect),
+}
diff --git a/Themes/_fallback/metrics.ini b/Themes/_fallback/metrics.ini
index a9e94e5202..c527f854c3 100644
--- a/Themes/_fallback/metrics.ini
+++ b/Themes/_fallback/metrics.ini
@@ -2855,60 +2855,82 @@ Fallback="ScreenOptionsServiceChild"
 NextScreen="ScreenOptionsService"
 HelpText=Screen.String("HelpTextMapControllers")
 #
+# This locks the input when the screen starts.
 LockInputSecs=2.5
+# The warning cannot be dismissed until this time expires.
+# This is additional time after LockInputSecs expires before the warning
+# will be sent the TweenOff command.
 AutoDismissWarningSecs=2.5
+# This is the number of lines that are visible on screen.  Set this if you
+# have a footer that covers up the bottom area of the screen.  The purpose
+# is to have the settings visible on screen even when the player's cursor is
+# on the exit choice.
 LinesVisible=16
+# This sets how long the NoSetListPrompt will show before being sent TweenOff.
 AutoDismissNoSetListPromptSecs=5
 #
+# The position of the Devices list and its On/Off commands.
 DevicesX=SCREEN_CENTER_X
 DevicesY=SCREEN_TOP+24
 DevicesOnCommand=zoom,0.75;draworder,5;strokecolor,color("0,0,0,1")
 DevicesOffCommand=
 #
-HeaderP1S1Command=x,SCREEN_CENTER_X-270
-HeaderP1S2Command=x,SCREEN_CENTER_X-195
-HeaderP1S3Command=x,SCREEN_CENTER_X-120
-HeaderP2S1Command=x,SCREEN_CENTER_X+120
-HeaderP2S2Command=x,SCREEN_CENTER_X+195
-HeaderP2S3Command=x,SCREEN_CENTER_X+270
-#
-headerCenterOnCommand=x,SCREEN_CENTER_X;y,-6;zoom,0.7;shadowlength,1;ztest,true
-HeaderOnCommand=diffuse,color("#808080");shadowlength,0;zoom,0.75;maxwidth,130;
-HeaderGainFocusCommand=diffuse,color("#808080");diffuseshift;effectcolor2,color("#808080");effectcolor1,color("#FFFFFF")
-HeaderLoseFocusCommand=diffuse,color("#808080");stopeffect
+# The ListHeader parts are the row that the player's cursor starts on with
+# the names of the columns.
+ListHeaderP1S1Command=x,SCREEN_CENTER_X-270
+ListHeaderP1S2Command=x,SCREEN_CENTER_X-195
+ListHeaderP1S3Command=x,SCREEN_CENTER_X-120
+ListHeaderP2S1Command=x,SCREEN_CENTER_X+120
+ListHeaderP2S2Command=x,SCREEN_CENTER_X+195
+ListHeaderP2S3Command=x,SCREEN_CENTER_X+270
+# ListHeaderCenterOnCommand is for the center element of the ListHeader.
+ListHeaderCenterOnCommand=x,SCREEN_CENTER_X;y,-6;zoom,0.7;shadowlength,1;ztest,true
+# These commands are shared by all the ListHeader parts.
+ListHeaderOnCommand=diffuse,color("#808080");shadowlength,0;zoom,0.75;maxwidth,130;
+ListHeaderGainFocusCommand=diffuse,color("#808080");diffuseshift;effectcolor2,color("#808080");effectcolor1,color("#FFFFFF")
+ListHeaderLoseFocusCommand=diffuse,color("#808080");stopeffect
 #
+# You want to leave the list of buttons to map so that all buttons for the
+# current game type will be mappable.
 ButtonsToMap=""
+#
+# The positions of the elements showing what is mapped.
 MappedToP1S1Command=x,SCREEN_CENTER_X-270
 MappedToP1S2Command=x,SCREEN_CENTER_X-195
 MappedToP1S3Command=x,SCREEN_CENTER_X-120
 MappedToP2S1Command=x,SCREEN_CENTER_X+120
 MappedToP2S2Command=x,SCREEN_CENTER_X+195
 MappedToP2S3Command=x,SCREEN_CENTER_X+270
-#
+# These commands are shared between all the elements.
 MappedToOnCommand=diffuse,color("#808080");shadowlength,0;zoom,0.75;maxwidth,130
+# WaitingCommand is executed when the player hits enter to set a key.
 MappedToWaitingCommand=diffuse,color("#FF8080");pulse;effectperiod,0.5;effectmagnitude,0.8,1.3,0
+# MappedInputCommand is executed after the player maps the key.
 MappedToMappedInputCommand=diffuse,color("#808080");diffuseshift;effectcolor2,color("#808080");effectcolor1,color("#FFFFFF")
 MappedToGainFocusCommand=diffuse,color("#808080");diffuseshift;effectcolor2,color("#808080");effectcolor1,color("#FFFFFF")
 MappedToLoseFocusCommand=diffuse,color("#808080");stopeffect
+# GainMarkCommand is executed when the player adds the element to the set list.
 MappedToGainMarkCommand=textglowmode,'TextGlowMode_Inner';glow,color("#FF00007f")
+# LoseMarkCommand is executed when the player removes the element from the set list.
 MappedToLoseMarkCommand=textglowmode,'TextGlowMode_Inner';glow,color("#FF000000")
 #
+# The LineScroller is an ActorScroller that controls the positioning of the
+# rows.
 LineScrollerOnCommand=%function(self) self:draworder(-1); self:y(64) self:setsecondsperitem(0.1) self:SetTransformFromHeight(24) end
 LineScrollerOffCommand=
 LineHideCommand=visible,false
 LineOnCommand=%function(self) self:y(0); self:visible(true); local LeftToRight = math.mod(self.ItemIndex, 2) == 0 and 1 or -1; self:addx(-SCREEN_WIDTH * LeftToRight); end
 LineOffCommand=%function(self) local LeftToRight = math.mod(self.ItemIndex, 2) == 0 and 1 or -1; self:stoptweening() self:accelerate(0.3); self:addx(SCREEN_WIDTH * LeftToRight); self:queuecommand('Hide') end
 #
-ErrorX=SCREEN_CENTER_X
-ErrorY=SCREEN_CENTER_Y
-ErrorOnCommand=diffuse,color("#00FF00");zoom,0.8
+# The "P1 slots" and "P2 slots" labels.  Use the entries in en.ini to change text.
 LabelP1OnCommand=x,SCREEN_CENTER_X*0.4;zoom,0.7;shadowlength,1
 LabelP1OffCommand=linear,0.5;diffusealpha,0
 LabelP2OnCommand=x,SCREEN_CENTER_X*1.6;zoom,0.7;shadowlength,1
 LabelP2OffCommand=linear,0.5;diffusealpha,0
+# The primary effect of keys on this row.
 PrimaryOnCommand=x,SCREEN_CENTER_X;y,-6;zoom,0.7;shadowlength,1;ztest,true
+# The secondary effect of keys on this row.
 SecondaryOnCommand=x,SCREEN_CENTER_X;y,6;zoom,0.5;shadowlength,1;ztest,true
-ShowExitRow=true
 
 [ScreenTestInput]
 Class="ScreenTestInput"
diff --git a/src/ScreenMapControllers.cpp b/src/ScreenMapControllers.cpp
index adf39b6707..71979a02fb 100644
--- a/src/ScreenMapControllers.cpp
+++ b/src/ScreenMapControllers.cpp
@@ -102,22 +102,21 @@ void ScreenMapControllers::Init()
 	// header row
 	{
 		m_Line.push_back(new ActorFrame);
-		m_headerCenter.LoadFromFont(THEME->GetPathF(m_sName, "title"));
-		m_headerCenter.SetName("headerCenter");
-		m_headerCenter.SetText(KEYNAME);
-		ActorUtil::LoadAllCommands(m_headerCenter, m_sName);
-		m_Line.back()->AddChild(&m_headerCenter);
+		m_ListHeaderCenter.LoadFromFont(THEME->GetPathF(m_sName, "title"));
+		m_ListHeaderCenter.SetName("ListHeaderCenter");
+		m_ListHeaderCenter.SetText(KEYNAME);
+		ActorUtil::LoadAllCommands(m_ListHeaderCenter, m_sName);
+		m_Line.back()->AddChild(&m_ListHeaderCenter);
 		FOREACH_ENUM(GameController,  c)
 		{
 			for(int s= 0; s < NUM_SHOWN_GAME_TO_DEVICE_SLOTS; ++s)
 			{
-				BitmapText& text= m_headerLabels[c][s];
+				BitmapText& text= m_ListHeaderLabels[c][s];
 				text.LoadFromFont(THEME->GetPathF(m_sName, "title"));
-				PlayerNumber pn = (PlayerNumber)c;
-				text.SetName("Header");
+				text.SetName("ListHeader");
 				text.SetText(SLOT_NAMES[s]);
 				text.RunCommands(THEME->GetMetricA(
-						m_sName, ssprintf("HeaderP%iS%iCommand", c+1, s+1)));
+						m_sName, ssprintf("ListHeaderP%iS%iCommand", c+1, s+1)));
 				ActorUtil::LoadAllCommands(text, m_sName);
 				m_Line.back()->AddChild(&text);
 			}
@@ -201,18 +200,18 @@ void ScreenMapControllers::Init()
 	m_NoSetListPrompt->SetName("NoSetListPrompt");
 	this->AddChild(m_NoSetListPrompt);
 
-	m_sprWarning.Load(THEME->GetPathG(m_sName, "warning"));
-	m_sprWarning->SetName("Warning");
-	m_sprWarning->SetDrawOrder(DRAW_ORDER_TRANSITIONS);
-	this->AddChild(m_sprWarning);
-	LOAD_ALL_COMMANDS(m_sprWarning);
+	m_Warning.Load(THEME->GetPathG(m_sName, "warning"));
+	m_Warning->SetName("Warning");
+	m_Warning->SetDrawOrder(DRAW_ORDER_TRANSITIONS);
+	this->AddChild(m_Warning);
+	LOAD_ALL_COMMANDS(m_Warning);
 }
 
 void ScreenMapControllers::BeginScreen()
 {
-	m_iCurController = 0;
-	m_iCurButton = 0;
-	m_iCurSlot = 0;
+	m_CurController = 0;
+	m_CurButton = 0;
+	m_CurSlot = 0;
 
 	ScreenWithMenuElements::BeginScreen();
 
@@ -223,7 +222,7 @@ void ScreenMapControllers::BeginScreen()
 	m_fLockInputSecs= THEME->GetMetricF(m_sName, "LockInputSecs");
 	m_AutoDismissWarningSecs= THEME->GetMetricF(m_sName, "AutoDismissWarningSecs");
 	m_AutoDismissNoSetListPromptSecs= 0.0f;
-	m_sprWarning->PlayCommand("TweenOn");
+	m_Warning->PlayCommand("TweenOn");
 }
 
 
@@ -263,13 +262,13 @@ void ScreenMapControllers::Update( float fDeltaTime )
 		ASSERT(CursorOnKey());
 		const KeyToMap *pKey = &m_KeysToMap[CurKeyIndex()];
 		
-		GameInput curGameI( (GameController)m_iCurController, pKey->m_GameButton );
+		GameInput curGameI( (GameController)m_CurController, pKey->m_GameButton );
 
-		INPUTMAPPER->SetInputMap( m_DeviceIToMap, curGameI, m_iCurSlot );
+		INPUTMAPPER->SetInputMap( m_DeviceIToMap, curGameI, m_CurSlot );
 		INPUTMAPPER->AddDefaultMappingsForCurrentGameIfUnmapped();
 		m_ChangeOccurred= true;
 
-		BitmapText *pText = pKey->m_textMappedTo[m_iCurController][m_iCurSlot];
+		BitmapText *pText = pKey->m_textMappedTo[m_CurController][m_CurSlot];
 		pText->PlayCommand("MappedInput");
 		if(m_InSetListMode)
 		{
@@ -419,8 +418,8 @@ bool ScreenMapControllers::Input( const InputEventPlus &input )
 			}
 			{
 				const KeyToMap *pKey = &m_KeysToMap[CurKeyIndex()];
-				GameInput curGameI( (GameController)m_iCurController, pKey->m_GameButton );
-				if( !INPUTMAPPER->ClearFromInputMap(curGameI, m_iCurSlot) )
+				GameInput curGameI( (GameController)m_CurController, pKey->m_GameButton );
+				if( !INPUTMAPPER->ClearFromInputMap(curGameI, m_CurSlot) )
 					break;
 
 				INPUTMAPPER->AddDefaultMappingsForCurrentGameIfUnmapped();
@@ -434,16 +433,16 @@ bool ScreenMapControllers::Input( const InputEventPlus &input )
 			{
 				break;
 			}
-			if( m_iCurSlot == 0 && m_iCurController == 0 )
+			if( m_CurSlot == 0 && m_CurController == 0 )
 			{
 				break;	// can't go left any more
 			}
 			BeforeChangeFocus();
-			m_iCurSlot--;
-			if( m_iCurSlot < 0 )
+			m_CurSlot--;
+			if( m_CurSlot < 0 )
 			{
-				m_iCurSlot = NUM_CHANGABLE_SLOTS-1;
-				m_iCurController--;
+				m_CurSlot = NUM_CHANGABLE_SLOTS-1;
+				m_CurController--;
 			}
 			AfterChangeFocus();
 			m_soundChange.Play();
@@ -454,16 +453,16 @@ bool ScreenMapControllers::Input( const InputEventPlus &input )
 			{
 				break;
 			}
-			if( m_iCurSlot == NUM_CHANGABLE_SLOTS-1 && m_iCurController == NUM_GameController-1 )
+			if( m_CurSlot == NUM_CHANGABLE_SLOTS-1 && m_CurController == NUM_GameController-1 )
 			{
 				break;	// can't go right any more
 			}
 			BeforeChangeFocus();
-			m_iCurSlot++;
-			if( m_iCurSlot > NUM_CHANGABLE_SLOTS-1 )
+			m_CurSlot++;
+			if( m_CurSlot > NUM_CHANGABLE_SLOTS-1 )
 			{
-				m_iCurSlot = 0;
-				m_iCurController++;
+				m_CurSlot = 0;
+				m_CurController++;
 			}
 			AfterChangeFocus();
 			m_soundChange.Play();
@@ -475,7 +474,7 @@ bool ScreenMapControllers::Input( const InputEventPlus &input )
 				break;
 			}
 			BeforeChangeFocus();
-			m_iCurButton--;
+			m_CurButton--;
 			AfterChangeFocus();
 			m_soundChange.Play();
 			bHandled = true;
@@ -486,7 +485,7 @@ bool ScreenMapControllers::Input( const InputEventPlus &input )
 				break;
 			}
 			BeforeChangeFocus();
-			m_iCurButton++;
+			m_CurButton++;
 			AfterChangeFocus();
 			m_soundChange.Play();
 			bHandled = true;
@@ -498,7 +497,7 @@ bool ScreenMapControllers::Input( const InputEventPlus &input )
 		case KEY_Cm:
 			if(CursorOnKey())
 			{
-				SetListEntry to_add(SetListEntry(CurKeyIndex(), m_iCurController, m_iCurSlot));
+				SetListEntry to_add(SetListEntry(CurKeyIndex(), m_CurController, m_CurSlot));
 				set<SetListEntry>::iterator found= m_SetList.find(to_add);
 				if(found == m_SetList.end())
 				{
@@ -535,7 +534,7 @@ bool ScreenMapControllers::Input( const InputEventPlus &input )
 
 	// This trace is also useless log spew.  Create a preference or something
 	// configurable if you disagree. -Kyz
-	// LOG->Trace( "m_iCurSlot: %d m_iCurController: %d m_iCurButton: %d", m_iCurSlot, m_iCurController, m_iCurButton );
+	// LOG->Trace( "m_CurSlot: %d m_CurController: %d m_CurButton: %d", m_CurSlot, m_CurController, m_CurButton );
 
 	Refresh();
 	return bHandled;
@@ -549,11 +548,11 @@ Actor *ScreenMapControllers::GetActorWithFocus()
 	}
 	if(CursorOnHeader())
 	{
-		return &(m_headerLabels[m_iCurController][m_iCurSlot]);
+		return &(m_ListHeaderLabels[m_CurController][m_CurSlot]);
 	}
 
 	const KeyToMap *pKey = &m_KeysToMap[CurKeyIndex()];
-	return pKey->m_textMappedTo[m_iCurController][m_iCurSlot];
+	return pKey->m_textMappedTo[m_CurController][m_CurSlot];
 }
 
 void ScreenMapControllers::BeforeChangeFocus()
@@ -589,26 +588,26 @@ void ScreenMapControllers::Refresh()
 	}
 
 	m_LineScroller.SetDestinationItem(
-		static_cast<float>(min(m_iCurButton, m_MaxDestItem)));
+		static_cast<float>(min(m_CurButton, m_MaxDestItem)));
 }
 
 void ScreenMapControllers::DismissWarning()
 {
-	m_sprWarning->PlayCommand("TweenOff");
+	m_Warning->PlayCommand("TweenOff");
 }
 
 bool ScreenMapControllers::CursorOnAction()
 {
 	// We have a header row, the rows for the keys, and the action rows.
 	// So every row after m_KeysToMap.size is an action row.
-	return m_iCurButton >= static_cast<int>(m_KeysToMap.size()+1);
+	return m_CurButton >= m_KeysToMap.size()+1;
 }
 
 bool ScreenMapControllers::CursorOnHeader()
 {
 	// We have a header row before all others.
 	// So the header is at 0.
-	return m_iCurButton == 0;
+	return m_CurButton == 0;
 }
 
 bool ScreenMapControllers::CursorOnKey()
@@ -618,37 +617,37 @@ bool ScreenMapControllers::CursorOnKey()
 
 bool ScreenMapControllers::CursorCanGoUp()
 {
-	return m_iCurButton > 0;
+	return m_CurButton > 0;
 }
 
 bool ScreenMapControllers::CursorCanGoDown()
 {
-	return m_iCurButton < m_KeysToMap.size() + m_Actions.size();
+	return m_CurButton < m_KeysToMap.size() + m_Actions.size();
 }
 
 int ScreenMapControllers::CurKeyIndex()
 {
-	// The header row is at 0, so subtract 1 from m_iCurButton.
-	return m_iCurButton - 1;
+	// The header row is at 0, so subtract 1 from m_CurButton.
+	return m_CurButton - 1;
 }
 
 int ScreenMapControllers::CurActionIndex()
 {
 	// Subtract the header row and the keys.
-	return m_iCurButton - 1 - m_KeysToMap.size();
+	return m_CurButton - 1 - m_KeysToMap.size();
 }
 
 void ScreenMapControllers::SetCursorFromSetListCurrent()
 {
-	m_iCurButton= m_SetListCurrent->m_button + 1;
-	m_iCurController= m_SetListCurrent->m_controller;
-	m_iCurSlot= m_SetListCurrent->m_slot;
+	m_CurButton= m_SetListCurrent->m_button + 1;
+	m_CurController= m_SetListCurrent->m_controller;
+	m_CurSlot= m_SetListCurrent->m_slot;
 }
 
 void ScreenMapControllers::StartWaitingForPress()
 {
 	const KeyToMap *pKey = &m_KeysToMap[CurKeyIndex()];
-	BitmapText *pText = pKey->m_textMappedTo[m_iCurController][m_iCurSlot];
+	BitmapText *pText = pKey->m_textMappedTo[m_CurController][m_CurSlot];
 	pText->PlayCommand( "Waiting" );
 	m_WaitingForPress.Touch();
 	m_DeviceIToMap.MakeInvalid();
@@ -663,12 +662,10 @@ void ScreenMapControllers::HandleScreenMessage(const ScreenMessage SM)
 			DEFAULT_FAIL(ScreenPrompt::s_LastAnswer);
 			case ANSWER_YES:
 				SaveToDisk();
-				SCREENMAN->PlayStartSound();
 				StartTransitioningScreen(SM_GoToNextScreen);
 				break;
 			case ANSWER_NO:
 				ReloadFromDisk();
-				SCREENMAN->PlayStartSound();
 				StartTransitioningScreen(SM_GoToNextScreen);
 				break;
 			case ANSWER_CANCEL:
diff --git a/src/ScreenMapControllers.h b/src/ScreenMapControllers.h
index ec83d89b2c..0cfe096352 100644
--- a/src/ScreenMapControllers.h
+++ b/src/ScreenMapControllers.h
@@ -39,10 +39,10 @@ private:
 	void SetCursorFromSetListCurrent();
 	void StartWaitingForPress();
 	
-	int m_iCurController;
-	int m_iCurButton;
-	int m_iCurSlot;
-	int m_MaxDestItem;
+	unsigned int m_CurController;
+	unsigned int m_CurButton;
+	unsigned int m_CurSlot;
+	unsigned int m_MaxDestItem;
 
 	bool m_ChangeOccurred;
 
@@ -61,11 +61,11 @@ private:
 	BitmapText m_textDevices;
 
 	BitmapText m_textLabel[NUM_GameController];
-	BitmapText m_headerCenter;
-	BitmapText m_headerLabels[NUM_GameController][NUM_SHOWN_GAME_TO_DEVICE_SLOTS];
+	BitmapText m_ListHeaderCenter;
+	BitmapText m_ListHeaderLabels[NUM_GameController][NUM_SHOWN_GAME_TO_DEVICE_SLOTS];
 
 	float m_AutoDismissWarningSecs;
-	AutoActor m_sprWarning;
+	AutoActor m_Warning;
 
 	float m_AutoDismissNoSetListPromptSecs;
 	AutoActor m_NoSetListPrompt;

From c6f598890b7967c8b4c2d7e941429d7c8f80d085 Mon Sep 17 00:00:00 2001
From: Kyzentun <kyzentun@gmail.com>
Date: Thu, 4 Sep 2014 18:04:51 -0600
Subject: [PATCH 23/24] Added max_dimension_use_zoom lua function to control
 whether an individual BitmapText uses the zoom in maxwidth calculations.

---
 Themes/_fallback/metrics.ini |  4 ++--
 src/BitmapText.cpp           | 25 ++++++++++++++++++++++---
 src/BitmapText.h             |  2 ++
 3 files changed, 26 insertions(+), 5 deletions(-)

diff --git a/Themes/_fallback/metrics.ini b/Themes/_fallback/metrics.ini
index c527f854c3..c2afcfe940 100644
--- a/Themes/_fallback/metrics.ini
+++ b/Themes/_fallback/metrics.ini
@@ -2886,7 +2886,7 @@ ListHeaderP2S3Command=x,SCREEN_CENTER_X+270
 # ListHeaderCenterOnCommand is for the center element of the ListHeader.
 ListHeaderCenterOnCommand=x,SCREEN_CENTER_X;y,-6;zoom,0.7;shadowlength,1;ztest,true
 # These commands are shared by all the ListHeader parts.
-ListHeaderOnCommand=diffuse,color("#808080");shadowlength,0;zoom,0.75;maxwidth,130;
+ListHeaderOnCommand=diffuse,color("#808080");shadowlength,0;max_dimension_use_zoom,true;zoom,0.75;maxwidth,130;
 ListHeaderGainFocusCommand=diffuse,color("#808080");diffuseshift;effectcolor2,color("#808080");effectcolor1,color("#FFFFFF")
 ListHeaderLoseFocusCommand=diffuse,color("#808080");stopeffect
 #
@@ -2902,7 +2902,7 @@ MappedToP2S1Command=x,SCREEN_CENTER_X+120
 MappedToP2S2Command=x,SCREEN_CENTER_X+195
 MappedToP2S3Command=x,SCREEN_CENTER_X+270
 # These commands are shared between all the elements.
-MappedToOnCommand=diffuse,color("#808080");shadowlength,0;zoom,0.75;maxwidth,130
+MappedToOnCommand=diffuse,color("#808080");shadowlength,0;zoom,0.75;max_dimension_use_zoom,true;maxwidth,130
 # WaitingCommand is executed when the player hits enter to set a key.
 MappedToWaitingCommand=diffuse,color("#FF8080");pulse;effectperiod,0.5;effectmagnitude,0.8,1.3,0
 # MappedInputCommand is executed after the player maps the key.
diff --git a/src/BitmapText.cpp b/src/BitmapText.cpp
index 6cd5586650..537393b440 100644
--- a/src/BitmapText.cpp
+++ b/src/BitmapText.cpp
@@ -54,6 +54,7 @@ BitmapText::BitmapText()
 	m_fMaxWidth = 0;
 	m_fMaxHeight = 0;
 	m_iVertSpacing = 0;
+	m_MaxDimensionUsesZoom= false;
 	m_bHasGlowAttribute = false;
 	// We'd be better off not adding strokes to things we can't control
 	// themewise (ScreenDebugOverlay for example). -Midiman
@@ -492,6 +493,11 @@ void BitmapText::SetMaxHeight( float fMaxHeight )
 	UpdateBaseZoom();
 }
 
+void BitmapText::SetMaxDimUseZoom(bool use)
+{
+	m_MaxDimensionUsesZoom= true;
+}
+
 void BitmapText::SetUppercase( bool b )
 {
 	m_bUppercase = b;
@@ -524,7 +530,11 @@ void BitmapText::UpdateBaseZoom()
 	} \
 	else \
 	{ \
-		const float dimension= dimension_get() / dimension_zoom_get(); \
+		float dimension= dimension_get(); \
+		if(m_MaxDimensionUsesZoom) \
+		{ \
+			dimension/= dimension_zoom_get(); \
+		} \
 		if(dimension != 0) \
 		{ \
 			const float zoom= min(1, dimension_max / dimension); \
@@ -853,8 +863,16 @@ class LunaBitmapText: public Luna<BitmapText>
 {
 public:
 	static int wrapwidthpixels( T* p, lua_State *L )	{ p->SetWrapWidthPixels( IArg(1) ); return 0; }
-	static int maxwidth( T* p, lua_State *L )		{ p->SetMaxWidth( FArg(1) ); return 0; }
-	static int maxheight( T* p, lua_State *L )		{ p->SetMaxHeight( FArg(1) ); return 0; }
+#define MAX_DIMENSION(maxdimension, SetMaxDimension) \
+	static int maxdimension( T* p, lua_State *L ) \
+	{ p->SetMaxDimension(FArg(1)); return 0; }
+	MAX_DIMENSION(maxwidth, SetMaxWidth);
+	MAX_DIMENSION(maxheight, SetMaxHeight);
+#undef MAX_DIMENSION
+	static int max_dimension_use_zoom(T* p, lua_State* L)
+	{
+		p->SetMaxDimUseZoom(lua_toboolean(L, 1));
+	}
 	static int vertspacing( T* p, lua_State *L )		{ p->SetVertSpacing( IArg(1) ); return 0; }
 	static int settext( T* p, lua_State *L )
 	{
@@ -902,6 +920,7 @@ public:
 		ADD_METHOD( wrapwidthpixels );
 		ADD_METHOD( maxwidth );
 		ADD_METHOD( maxheight );
+		ADD_METHOD( max_dimension_use_zoom );
 		ADD_METHOD( vertspacing );
 		ADD_METHOD( settext );
 		ADD_METHOD( rainbowscroll );
diff --git a/src/BitmapText.h b/src/BitmapText.h
index 6a1fad3a00..046f1385ff 100644
--- a/src/BitmapText.h
+++ b/src/BitmapText.h
@@ -25,6 +25,7 @@ public:
 	void SetVertSpacing( int iSpacing );
 	void SetMaxWidth( float fMaxWidth );
 	void SetMaxHeight( float fMaxHeight );
+	void SetMaxDimUseZoom(bool use);
 	void SetWrapWidthPixels( int iWrapWidthPixels );
 	void CropToWidth( int iWidthInSourcePixels );
 
@@ -77,6 +78,7 @@ protected:
 	int			m_iWrapWidthPixels;		// -1 = no wrap
 	float		m_fMaxWidth;			// 0 = no max
 	float		m_fMaxHeight;			// 0 = no max
+	bool m_MaxDimensionUsesZoom;
 	bool		m_bRainbowScroll;
 	bool		m_bJitter;
 	bool		m_bUsingDistortion;

From b75679f3c1562de7f6e411807473c55eede95101 Mon Sep 17 00:00:00 2001
From: Kyzentun <kyzentun@gmail.com>
Date: Thu, 4 Sep 2014 18:21:39 -0600
Subject: [PATCH 24/24] Actually use the argument in SetMaxDimUseZoom.

---
 src/BitmapText.cpp | 2 +-
 src/BitmapText.h   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/BitmapText.cpp b/src/BitmapText.cpp
index 537393b440..30945c0587 100644
--- a/src/BitmapText.cpp
+++ b/src/BitmapText.cpp
@@ -495,7 +495,7 @@ void BitmapText::SetMaxHeight( float fMaxHeight )
 
 void BitmapText::SetMaxDimUseZoom(bool use)
 {
-	m_MaxDimensionUsesZoom= true;
+	m_MaxDimensionUsesZoom= use;
 }
 
 void BitmapText::SetUppercase( bool b )
diff --git a/src/BitmapText.h b/src/BitmapText.h
index 046f1385ff..329c5540f1 100644
--- a/src/BitmapText.h
+++ b/src/BitmapText.h
@@ -78,7 +78,7 @@ protected:
 	int			m_iWrapWidthPixels;		// -1 = no wrap
 	float		m_fMaxWidth;			// 0 = no max
 	float		m_fMaxHeight;			// 0 = no max
-	bool m_MaxDimensionUsesZoom;
+	bool		m_MaxDimensionUsesZoom;
 	bool		m_bRainbowScroll;
 	bool		m_bJitter;
 	bool		m_bUsingDistortion;