From d119f68c2961d03cd2ab4b1fd196cb0135604645 Mon Sep 17 00:00:00 2001
From: John Bauer <angledluffa@users.sourceforge.net>
Date: Mon, 23 Oct 2006 18:06:55 +0000
Subject: [PATCH] Fix the disappearing backgrounds.  By changing all instances
 of P.FileX to FileX, the existing code (which uses lua globals) works again.

---
 stepmania/BackgroundEffects/Centered.xml               | 2 +-
 stepmania/BackgroundEffects/Checkerboard1File2x2.xml   | 8 ++++----
 stepmania/BackgroundEffects/Checkerboard2File2x2.xml   | 8 ++++----
 stepmania/BackgroundEffects/Kaleidoscope2x2.xml        | 8 ++++----
 stepmania/BackgroundEffects/SongBgWithMovieViz.xml     | 2 +-
 stepmania/BackgroundEffects/StretchNoLoop.xml          | 2 +-
 stepmania/BackgroundEffects/StretchNormal.xml          | 2 +-
 stepmania/BackgroundEffects/StretchNormalAlignLeft.xml | 2 +-
 stepmania/BackgroundEffects/StretchPaused.xml          | 2 +-
 stepmania/BackgroundEffects/StretchRewind.xml          | 2 +-
 stepmania/BackgroundEffects/UpperLeft.xml              | 2 +-
 11 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/stepmania/BackgroundEffects/Centered.xml b/stepmania/BackgroundEffects/Centered.xml
index 270cec9f1b..a45bd2ead0 100644
--- a/stepmania/BackgroundEffects/Centered.xml
+++ b/stepmania/BackgroundEffects/Centered.xml
@@ -1,6 +1,6 @@
 <ActorFrame><children>
 	<AutoActor 
-		File="P.File1" 
+		File="File1" 
 		OnCommand="x,SCREEN_CENTER_X;y,SCREEN_CENTER_Y"
 	/>
 </children></ActorFrame>
diff --git a/stepmania/BackgroundEffects/Checkerboard1File2x2.xml b/stepmania/BackgroundEffects/Checkerboard1File2x2.xml
index 4af22ca41f..5cd523c6c3 100644
--- a/stepmania/BackgroundEffects/Checkerboard1File2x2.xml
+++ b/stepmania/BackgroundEffects/Checkerboard1File2x2.xml
@@ -1,6 +1,6 @@
 <ActorFrame><children>
-	<AutoActor File="P.File1" OnCommand="x,scale(1,0,4,SCREEN_LEFT,SCREEN_RIGHT);y,scale(1,0,4,SCREEN_TOP,SCREEN_BOTTOM);zoomtowidth,SCREEN_WIDTH/2;zoomtoheight,SCREEN_HEIGHT/2" />
-	<AutoActor File="P.File1" OnCommand="x,scale(3,0,4,SCREEN_LEFT,SCREEN_RIGHT);y,scale(1,0,4,SCREEN_TOP,SCREEN_BOTTOM);zoomtowidth,SCREEN_WIDTH/2;zoomtoheight,SCREEN_HEIGHT/2" />
-	<AutoActor File="P.File1" OnCommand="x,scale(1,0,4,SCREEN_LEFT,SCREEN_RIGHT);y,scale(3,0,4,SCREEN_TOP,SCREEN_BOTTOM);zoomtowidth,SCREEN_WIDTH/2;zoomtoheight,SCREEN_HEIGHT/2" />
-	<AutoActor File="P.File1" OnCommand="x,scale(3,0,4,SCREEN_LEFT,SCREEN_RIGHT);y,scale(3,0,4,SCREEN_TOP,SCREEN_BOTTOM);zoomtowidth,SCREEN_WIDTH/2;zoomtoheight,SCREEN_HEIGHT/2" />
+	<AutoActor File="File1" OnCommand="x,scale(1,0,4,SCREEN_LEFT,SCREEN_RIGHT);y,scale(1,0,4,SCREEN_TOP,SCREEN_BOTTOM);zoomtowidth,SCREEN_WIDTH/2;zoomtoheight,SCREEN_HEIGHT/2" />
+	<AutoActor File="File1" OnCommand="x,scale(3,0,4,SCREEN_LEFT,SCREEN_RIGHT);y,scale(1,0,4,SCREEN_TOP,SCREEN_BOTTOM);zoomtowidth,SCREEN_WIDTH/2;zoomtoheight,SCREEN_HEIGHT/2" />
+	<AutoActor File="File1" OnCommand="x,scale(1,0,4,SCREEN_LEFT,SCREEN_RIGHT);y,scale(3,0,4,SCREEN_TOP,SCREEN_BOTTOM);zoomtowidth,SCREEN_WIDTH/2;zoomtoheight,SCREEN_HEIGHT/2" />
+	<AutoActor File="File1" OnCommand="x,scale(3,0,4,SCREEN_LEFT,SCREEN_RIGHT);y,scale(3,0,4,SCREEN_TOP,SCREEN_BOTTOM);zoomtowidth,SCREEN_WIDTH/2;zoomtoheight,SCREEN_HEIGHT/2" />
 </children></ActorFrame>
diff --git a/stepmania/BackgroundEffects/Checkerboard2File2x2.xml b/stepmania/BackgroundEffects/Checkerboard2File2x2.xml
index 735a689051..cf5166736f 100644
--- a/stepmania/BackgroundEffects/Checkerboard2File2x2.xml
+++ b/stepmania/BackgroundEffects/Checkerboard2File2x2.xml
@@ -1,6 +1,6 @@
 <ActorFrame><children>
-	<AutoActor File="P.File1" OnCommand="x,scale(1,0,4,SCREEN_LEFT,SCREEN_RIGHT);y,scale(1,0,4,SCREEN_TOP,SCREEN_BOTTOM);zoomtowidth,SCREEN_WIDTH/2;zoomtoheight,SCREEN_HEIGHT/2" />
-	<AutoActor File="P.File2" OnCommand="x,scale(3,0,4,SCREEN_LEFT,SCREEN_RIGHT);y,scale(1,0,4,SCREEN_TOP,SCREEN_BOTTOM);zoomtowidth,SCREEN_WIDTH/2;zoomtoheight,SCREEN_HEIGHT/2" />
-	<AutoActor File="P.File2" OnCommand="x,scale(1,0,4,SCREEN_LEFT,SCREEN_RIGHT);y,scale(3,0,4,SCREEN_TOP,SCREEN_BOTTOM);zoomtowidth,SCREEN_WIDTH/2;zoomtoheight,SCREEN_HEIGHT/2" />
-	<AutoActor File="P.File1" OnCommand="x,scale(3,0,4,SCREEN_LEFT,SCREEN_RIGHT);y,scale(3,0,4,SCREEN_TOP,SCREEN_BOTTOM);zoomtowidth,SCREEN_WIDTH/2;zoomtoheight,SCREEN_HEIGHT/2" />
+	<AutoActor File="File1" OnCommand="x,scale(1,0,4,SCREEN_LEFT,SCREEN_RIGHT);y,scale(1,0,4,SCREEN_TOP,SCREEN_BOTTOM);zoomtowidth,SCREEN_WIDTH/2;zoomtoheight,SCREEN_HEIGHT/2" />
+	<AutoActor File="File2" OnCommand="x,scale(3,0,4,SCREEN_LEFT,SCREEN_RIGHT);y,scale(1,0,4,SCREEN_TOP,SCREEN_BOTTOM);zoomtowidth,SCREEN_WIDTH/2;zoomtoheight,SCREEN_HEIGHT/2" />
+	<AutoActor File="File2" OnCommand="x,scale(1,0,4,SCREEN_LEFT,SCREEN_RIGHT);y,scale(3,0,4,SCREEN_TOP,SCREEN_BOTTOM);zoomtowidth,SCREEN_WIDTH/2;zoomtoheight,SCREEN_HEIGHT/2" />
+	<AutoActor File="File1" OnCommand="x,scale(3,0,4,SCREEN_LEFT,SCREEN_RIGHT);y,scale(3,0,4,SCREEN_TOP,SCREEN_BOTTOM);zoomtowidth,SCREEN_WIDTH/2;zoomtoheight,SCREEN_HEIGHT/2" />
 </children></ActorFrame>
diff --git a/stepmania/BackgroundEffects/Kaleidoscope2x2.xml b/stepmania/BackgroundEffects/Kaleidoscope2x2.xml
index 3449b536f3..7ea1a448fa 100644
--- a/stepmania/BackgroundEffects/Kaleidoscope2x2.xml
+++ b/stepmania/BackgroundEffects/Kaleidoscope2x2.xml
@@ -1,6 +1,6 @@
 <ActorFrame><children>
-	<AutoActor File="P.File1" OnCommand="x,scale(1,0,4,SCREEN_LEFT,SCREEN_RIGHT);y,scale(1,0,4,SCREEN_TOP,SCREEN_BOTTOM);zoomtowidth,SCREEN_WIDTH/2;zoomtoheight,SCREEN_HEIGHT/2" />
-	<AutoActor File="P.File1" OnCommand="x,scale(3,0,4,SCREEN_LEFT,SCREEN_RIGHT);y,scale(1,0,4,SCREEN_TOP,SCREEN_BOTTOM);zoomtowidth,SCREEN_WIDTH/2;zoomtoheight,SCREEN_HEIGHT/2;zoomx,self:GetZoomX()*-1" />
-	<AutoActor File="P.File1" OnCommand="x,scale(1,0,4,SCREEN_LEFT,SCREEN_RIGHT);y,scale(3,0,4,SCREEN_TOP,SCREEN_BOTTOM);zoomtowidth,SCREEN_WIDTH/2;zoomtoheight,SCREEN_HEIGHT/2;zoomy,self:GetZoomY()*-1" />
-	<AutoActor File="P.File1" OnCommand="x,scale(3,0,4,SCREEN_LEFT,SCREEN_RIGHT);y,scale(3,0,4,SCREEN_TOP,SCREEN_BOTTOM);zoomtowidth,SCREEN_WIDTH/2;zoomtoheight,SCREEN_HEIGHT/2;zoomx,self:GetZoomX()*-1;zoomy,self:GetZoomY()*-1" />
+	<AutoActor File="File1" OnCommand="x,scale(1,0,4,SCREEN_LEFT,SCREEN_RIGHT);y,scale(1,0,4,SCREEN_TOP,SCREEN_BOTTOM);zoomtowidth,SCREEN_WIDTH/2;zoomtoheight,SCREEN_HEIGHT/2" />
+	<AutoActor File="File1" OnCommand="x,scale(3,0,4,SCREEN_LEFT,SCREEN_RIGHT);y,scale(1,0,4,SCREEN_TOP,SCREEN_BOTTOM);zoomtowidth,SCREEN_WIDTH/2;zoomtoheight,SCREEN_HEIGHT/2;zoomx,self:GetZoomX()*-1" />
+	<AutoActor File="File1" OnCommand="x,scale(1,0,4,SCREEN_LEFT,SCREEN_RIGHT);y,scale(3,0,4,SCREEN_TOP,SCREEN_BOTTOM);zoomtowidth,SCREEN_WIDTH/2;zoomtoheight,SCREEN_HEIGHT/2;zoomy,self:GetZoomY()*-1" />
+	<AutoActor File="File1" OnCommand="x,scale(3,0,4,SCREEN_LEFT,SCREEN_RIGHT);y,scale(3,0,4,SCREEN_TOP,SCREEN_BOTTOM);zoomtowidth,SCREEN_WIDTH/2;zoomtoheight,SCREEN_HEIGHT/2;zoomx,self:GetZoomX()*-1;zoomy,self:GetZoomY()*-1" />
 </children></ActorFrame>
diff --git a/stepmania/BackgroundEffects/SongBgWithMovieViz.xml b/stepmania/BackgroundEffects/SongBgWithMovieViz.xml
index d86000535c..c97a8d56b0 100644
--- a/stepmania/BackgroundEffects/SongBgWithMovieViz.xml
+++ b/stepmania/BackgroundEffects/SongBgWithMovieViz.xml
@@ -5,7 +5,7 @@
 		OnCommand="x,SCREEN_CENTER_X;y,SCREEN_CENTER_Y;ZoomToWidth,SCREEN_WIDTH;ZoomToHeight,SCREEN_HEIGHT;diffuse,color(self.Color)"
 	/>
 	<Layer
-		File="P.File1"
+		File="File1"
 		InitCommand="%function(self) self:pause(); self.Color = Color2; end"
 		OnCommand="blend,add;x,SCREEN_CENTER_X;y,SCREEN_CENTER_Y;ZoomToWidth,SCREEN_WIDTH;ZoomToHeight,SCREEN_HEIGHT;diffuse,color(self.Color)"
 		GainFocusCommand="Play"
diff --git a/stepmania/BackgroundEffects/StretchNoLoop.xml b/stepmania/BackgroundEffects/StretchNoLoop.xml
index 19174435fd..54e4e633bf 100644
--- a/stepmania/BackgroundEffects/StretchNoLoop.xml
+++ b/stepmania/BackgroundEffects/StretchNoLoop.xml
@@ -1,6 +1,6 @@
 <ActorFrame><children>
 	<AutoActor 
-		File="P.File1" 
+		File="File1" 
 		OnCommand="scale_or_crop_background;loop,0"
 	/>
 </children></ActorFrame>
diff --git a/stepmania/BackgroundEffects/StretchNormal.xml b/stepmania/BackgroundEffects/StretchNormal.xml
index 166424fb6d..8d7c33e0bf 100644
--- a/stepmania/BackgroundEffects/StretchNormal.xml
+++ b/stepmania/BackgroundEffects/StretchNormal.xml
@@ -1,6 +1,6 @@
 <ActorFrame><children>
 	<Layer
-		File="P.File1" 
+		File="File1" 
 		InitCommand="%function(self) self.Color = Color1; end"
 		OnCommand="scale_or_crop_background;diffuse,color(self.Color)" 
 		GainFocusCommand="Play"
diff --git a/stepmania/BackgroundEffects/StretchNormalAlignLeft.xml b/stepmania/BackgroundEffects/StretchNormalAlignLeft.xml
index 3ac0e6d2f4..a938e4e757 100644
--- a/stepmania/BackgroundEffects/StretchNormalAlignLeft.xml
+++ b/stepmania/BackgroundEffects/StretchNormalAlignLeft.xml
@@ -1,7 +1,7 @@
 <!-- Align left when cropping to 4:3.  Avoid this; it's not compatible with PS2 movie pre-rendering. -->
 <ActorFrame><children>
 	<Layer
-		File="P.File1" 
+		File="File1" 
 		InitCommand="%function(self) self.Color = Color1; end"
 		OnCommand="horizalign,left;scaletocover,0,0,SCREEN_WIDTH,SCREEN_HEIGHT;diffuse,color(self.Color)" 
 		GainFocusCommand="Play"
diff --git a/stepmania/BackgroundEffects/StretchPaused.xml b/stepmania/BackgroundEffects/StretchPaused.xml
index ce5895f0a1..c8fb01c9f7 100644
--- a/stepmania/BackgroundEffects/StretchPaused.xml
+++ b/stepmania/BackgroundEffects/StretchPaused.xml
@@ -1,6 +1,6 @@
 <ActorFrame><children>
 	<AutoActor 
-		File="P.File1" 
+		File="File1" 
 		OnCommand="scale_or_crop_background;Pause" 
 	/>
 </children></ActorFrame>
diff --git a/stepmania/BackgroundEffects/StretchRewind.xml b/stepmania/BackgroundEffects/StretchRewind.xml
index dbed03b03c..de63c4916c 100644
--- a/stepmania/BackgroundEffects/StretchRewind.xml
+++ b/stepmania/BackgroundEffects/StretchRewind.xml
@@ -1,6 +1,6 @@
 <ActorFrame><children>
 	<AutoActor 
-		File="P.File1" 
+		File="File1" 
 		OnCommand="scale_or_crop_background;position,0"
 	/>
 </children></ActorFrame>
diff --git a/stepmania/BackgroundEffects/UpperLeft.xml b/stepmania/BackgroundEffects/UpperLeft.xml
index 31fa8031bc..8d722fd3b4 100644
--- a/stepmania/BackgroundEffects/UpperLeft.xml
+++ b/stepmania/BackgroundEffects/UpperLeft.xml
@@ -1,4 +1,4 @@
 <ActorFrame><children>
 	<!-- upper left corner -->
-	<AutoActor File="P.File1" />
+	<AutoActor File="File1" />
 </children></ActorFrame>