From fd18a8ce28432c93121966fd512565201ede05ff Mon Sep 17 00:00:00 2001 From: Chris Danford Date: Sun, 5 Apr 2009 19:40:48 +0000 Subject: [PATCH] undo accidental delete --- .../ScreenWithMenuElements decorations/default.lua | 11 +++++++++++ .../default/Graphics/ScreenEditMenu footer.redir | 1 + stepmania/src/FadingBanner.cpp | 5 ----- 3 files changed, 12 insertions(+), 5 deletions(-) create mode 100644 stepmania/Themes/default/BGAnimations/ScreenWithMenuElements decorations/default.lua create mode 100644 stepmania/Themes/default/Graphics/ScreenEditMenu footer.redir diff --git a/stepmania/Themes/default/BGAnimations/ScreenWithMenuElements decorations/default.lua b/stepmania/Themes/default/BGAnimations/ScreenWithMenuElements decorations/default.lua new file mode 100644 index 0000000000..6cad88486a --- /dev/null +++ b/stepmania/Themes/default/BGAnimations/ScreenWithMenuElements decorations/default.lua @@ -0,0 +1,11 @@ +-- This needs to be an ActorFrame because children will want to load the base and merge their own elements into the table. +t = Def.ActorFrame {}; +t[#t+1] = StandardDecorationFromFile( "LeftFrame", "LeftFrame" ); +t[#t+1] = StandardDecorationFromFile( "RightFrame", "RightFrame" ); +t[#t+1] = StandardDecorationFromFile( "Header", "Header" ); +t[#t+1] = StandardDecorationFromFile( "Footer", "Footer" ); +t[#t+1] = StandardDecorationFromFileOptional( "Help", "Help" ); +t[#t+1] = StandardDecorationFromFileOptional( "StyleIcon", "StyleIcon" ); +t[#t+1] = StandardDecorationFromFileOptional( "StageFrame", "StageFrame" ); +t[#t+1] = StandardDecorationFromFileOptional( "StageDisplay", "StageDisplay" ); +return t; \ No newline at end of file diff --git a/stepmania/Themes/default/Graphics/ScreenEditMenu footer.redir b/stepmania/Themes/default/Graphics/ScreenEditMenu footer.redir new file mode 100644 index 0000000000..ef927067c9 --- /dev/null +++ b/stepmania/Themes/default/Graphics/ScreenEditMenu footer.redir @@ -0,0 +1 @@ +_footer shared \ No newline at end of file diff --git a/stepmania/src/FadingBanner.cpp b/stepmania/src/FadingBanner.cpp index 50e96c1561..4cedae003a 100644 --- a/stepmania/src/FadingBanner.cpp +++ b/stepmania/src/FadingBanner.cpp @@ -30,11 +30,6 @@ FadingBanner::FadingBanner() { m_Banner[i].SetName( "Banner" ); ActorUtil::LoadAllCommandsAndOnCommand( m_Banner[i], "FadingBanner" ); - - /* TODO: Move this into Lua. Ideally, there should be a ZTEST_NO_CHANGE that - * would let a ztest command on an ActorFrame propagate to all children. */ - m_Banner[i].SetZTestMode( ZTEST_WRITE_ON_FAIL ); - this->AddChild( &m_Banner[i] ); } }