From da20a878143eefc42043e4bb93940e0b84f14d2b Mon Sep 17 00:00:00 2001 From: Thai Pangsakulyanont Date: Fri, 25 Mar 2011 13:22:49 +0700 Subject: [PATCH 1/4] delete m_pTextSectionCount in destructor. --- src/MusicWheelItem.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/MusicWheelItem.cpp b/src/MusicWheelItem.cpp index 3ecf7d81d3..c7ad0fb3c3 100644 --- a/src/MusicWheelItem.cpp +++ b/src/MusicWheelItem.cpp @@ -124,7 +124,6 @@ MusicWheelItem::MusicWheelItem( const MusicWheelItem &cpy ): WheelItemBase( cpy ), GRADES_SHOW_MACHINE( cpy.GRADES_SHOW_MACHINE ), m_TextBanner( cpy.m_TextBanner ), - m_pTextSectionCount( cpy.m_pTextSectionCount ), m_WheelNotifyIcon( cpy.m_WheelNotifyIcon ) { FOREACH_ENUM( MusicWheelItemType, i ) @@ -157,7 +156,7 @@ MusicWheelItem::MusicWheelItem( const MusicWheelItem &cpy ): } } - //m_pTextSectionCount = new BitmapText( *cpy.m_pTextSectionCount ); + m_pTextSectionCount = new BitmapText( *cpy.m_pTextSectionCount ); this->AddChild( m_pTextSectionCount ); this->AddChild( &m_WheelNotifyIcon ); @@ -171,6 +170,7 @@ MusicWheelItem::MusicWheelItem( const MusicWheelItem &cpy ): MusicWheelItem::~MusicWheelItem() { + delete m_pTextSectionCount; } void MusicWheelItem::LoadFromWheelItemData( const WheelItemBaseData *pData, int iIndex, bool bHasFocus, int iDrawIndex ) From 6afe4a496c680400cf2328570b1911fef728db3e Mon Sep 17 00:00:00 2001 From: AJ Kelly Date: Fri, 25 Mar 2011 01:45:19 -0500 Subject: [PATCH 2/4] update lua.xml --- Docs/Luadoc/Lua.xml | 75 ++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 74 insertions(+), 1 deletion(-) diff --git a/Docs/Luadoc/Lua.xml b/Docs/Luadoc/Lua.xml index d489f9638b..334204ea30 100644 --- a/Docs/Luadoc/Lua.xml +++ b/Docs/Luadoc/Lua.xml @@ -803,6 +803,7 @@ + @@ -887,7 +888,79 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -1993,5 +2066,5 @@ sm-ssc v1.2.3 - 2011-03-15 + 2011-03-20 From cec3ebb5ba7d3e11b5a368a1c31d8461ad5f56c5 Mon Sep 17 00:00:00 2001 From: AJ Kelly Date: Fri, 25 Mar 2011 02:56:40 -0500 Subject: [PATCH 3/4] remove unused ScreenQuickSetup and related items --- Themes/_fallback/Languages/en.ini | 12 ---- Themes/_fallback/Scripts/02 Branches.lua | 6 -- Themes/_fallback/metrics.ini | 85 +----------------------- 3 files changed, 1 insertion(+), 102 deletions(-) diff --git a/Themes/_fallback/Languages/en.ini b/Themes/_fallback/Languages/en.ini index 44ee600478..4e465f8675 100644 --- a/Themes/_fallback/Languages/en.ini +++ b/Themes/_fallback/Languages/en.ini @@ -2225,18 +2225,6 @@ HeaderText=Edit Course HelpText=&MENUUP;&MENUDOWN; Move &MENULEFT;&MENURIGHT; Change Value [ScreenOptionsCourseOverview] HeaderText=Course Overview -[ScreenQuickSetupOverview] -HeaderText=Quick Setup - Welcome! -[ScreenQuickSetupPhaseOne] -HeaderText=Quick Setup - Page 1: Profile -[ScreenQuickSetupPhaseTwo] -HeaderText=Quick Setup - Page 2: Gameplay -[ScreenQuickSetupPhaseThree] -HeaderText=Quick Setup - Page 3: Appearance -[ScreenQuickSetupPhaseFour] -HeaderText=Quick Setup - Page 4: Extra -[ScreenQuickSetupFinished] -HeaderText=Quick Setup - Finished! [ScreenSelectProfile] HeaderText=Select Profile [ScreenSelectPlayStyle] diff --git a/Themes/_fallback/Scripts/02 Branches.lua b/Themes/_fallback/Scripts/02 Branches.lua index 471e9bd30e..f10f448946 100644 --- a/Themes/_fallback/Scripts/02 Branches.lua +++ b/Themes/_fallback/Scripts/02 Branches.lua @@ -193,10 +193,4 @@ Branch = { Network = function() return IsNetConnected() and "ScreenTitleMenu" or "ScreenTitleMenu" end, - QuickSetupStart = "ScreenQuickSetupOverview", - QuickSetupA = "ScreenQuickSetupPhaseOne", - QuickSetupB = "ScreenQuickSetupPhaseTwo", - QuickSetupC = "ScreenQuickSetupPhaseThree", - QuickSetupD = "ScreenQuickSetupPhaseFour", - QuickSetupFinished = "ScreenQuickSetupFinished" } diff --git a/Themes/_fallback/metrics.ini b/Themes/_fallback/metrics.ini index b37ce668a6..c92fd40354 100644 --- a/Themes/_fallback/metrics.ini +++ b/Themes/_fallback/metrics.ini @@ -1661,9 +1661,7 @@ Choice5="text,Edit/Share;screen,"..Branch.OptionsEdit() Choice6="screen,ScreenJukeboxMenu;text,Jukebox" Choice7="screen,ScreenExit;text,Exit" Choice8="screen,ScreenTest;text,Sandbox" -Choice9="screen,ScreenQuickSetupOverview;text,Setup" # Aliases for the future. -ChoiceSetup="screen,ScreenQuickSetupOverview;text,Setup" ChoiceGameStart="applydefaultoptions;text,Game Start;screen,"..Branch.StartGame() ChoiceOnline="screen,ScreenNetworkOptions;text,Play Online" ChoiceGameSelect="screen,ScreenSelectGame;text,Select Game" @@ -1671,7 +1669,6 @@ ChoiceOptions="screen,ScreenOptionsSystemDirection;text,Options" ChoiceEdit="text,Edit/Share;screen,"..Branch.OptionsEdit() ChoiceJukebox="screen,ScreenJukeboxMenu;text,Jukebox" ChoiceSandbox="screen,ScreenTest;text,Sandbox" -ChoiceSetup="screen,ScreenQuickSetupOverview;text,Setup" ChoiceExit="screen,ScreenExit;text,Exit" # AllowRepeatingInput=true @@ -1720,87 +1717,7 @@ LogoX=SCREEN_CENTER_X LogoY=SCREEN_CENTER_Y-80 LogoOnCommand=bob;effectperiod,4;effectmagnitude,0,8,0;zoom,0;bounceend,0.35;zoom,1 LogoOffCommand= -[ScreenQuickSetupOverview] -Class="ScreenSelectMaster" -Fallback="ScreenSelectMaster" -# -NextScreen=Branch.QuickSetupA -PrevScreen=Branch.TitleMenu() -# -TimerSeconds=-1 -# -DefaultChoice="Start" -ChoiceNames="Start,Back" -# -ChoiceStart="name,Start;screen,".. Branch.QuickSetupA -ChoiceBack="name,Back;screen,".. Branch.TitleMenu -# -PerChoiceScrollElement=false -PerChoiceIconElement=false -# -ShowScroller=true -WrapScroller=false -ShowIcon=true -[ScreenQuickSetupPhaseOne] -Class="ScreenSelectMaster" -Fallback="ScreenQuickSetupOverview" -# -NextScreen=Branch.QuickSetupBl -PrevScreen=Branch.QuickSetupStart -# -DefaultChoice="Set" -ChoiceNames="Set,Back" -# -ChoiceSet="name,Set;screen,".. Branch.QuickSetupB -ChoiceBack="name,Back;screen,".. Branch.QuickSetupStart -[ScreenQuickSetupPhaseTwo] -Class="ScreenSelectMaster" -Fallback="ScreenQuickSetupOverview" -# -NextScreen=Branch.QuickSetupC -PrevScreen=Branch.QuickSetupA -# -DefaultChoice="Set" -ChoiceNames="Set,Back" -# -ChoiceSet="name,Set;screen,".. Branch.QuickSetupC -ChoiceBack="name,Back;screen,".. Branch.QuickSetupA -[ScreenQuickSetupPhaseThree] -Class="ScreenSelectMaster" -Fallback="ScreenQuickSetupOverview" -# -NextScreen=Branch.QuickSetupD -PrevScreen=Branch.QuickSetupB -# -DefaultChoice="Set" -ChoiceNames="Set,Back" -# -ChoiceSet="name,Set;screen,".. Branch.QuickSetupD -ChoiceBack="name,Back;screen,".. Branch.QuickSetupB -[ScreenQuickSetupPhaseFour] -Class="ScreenSelectMaster" -Fallback="ScreenQuickSetupOverview" -# -NextScreen=Branch.QuickSetupFinished -PrevScreen=Branch.QuickSetupC -# -DefaultChoice="Set" -ChoiceNames="Set,Back" -# -ChoiceSet="name,Set;screen,".. Branch.QuickSetupFinished -ChoiceBack="name,Back;screen,".. Branch.QuickSetupC -[ScreenQuickSetupFinished] -Class="ScreenSelectMaster" -Fallback="ScreenQuickSetupOverview" -# -NextScreen=Branch.TitleMenu() -PrevScreen=Branch.QuickSetupD -# -DefaultChoice="Set" -ChoiceNames="Set,Back" -# -ChoiceSet="name,Set;screen,".. Branch.TitleMenu -ChoiceBack="name,Back;screen,".. Branch.QuickSetupD + [ScreenProfileLoad] Class="ScreenProfileLoad" Fallback="ScreenWithMenuElementsBlank" From 0f6d954066f0579aad202e850855222edb07b81f Mon Sep 17 00:00:00 2001 From: AJ Kelly Date: Fri, 25 Mar 2011 15:42:39 -0500 Subject: [PATCH 4/4] changelog up --- Docs/Changelog_sm-ssc.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Docs/Changelog_sm-ssc.txt b/Docs/Changelog_sm-ssc.txt index 20b7ecc9cf..af644b111f 100644 --- a/Docs/Changelog_sm-ssc.txt +++ b/Docs/Changelog_sm-ssc.txt @@ -10,7 +10,7 @@ supported but exist anyways.) _____________________________________________________________________________ ================================================================================ -sm-ssc v1.2.4 | 20110??? +sm-ssc v1.2.4 | 2011032? -------------------------------------------------------------------------------- 20110320