[br:warps] bring in changes from default branch

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

Docs/Luadoc/Lua.xml

@@ -803,6 +803,7 @@
 			<Function name='LoadFromMultiPlayer'/>
 		</Class>
 		<Class name='InputFilter'>
+			<Function name='GetMouseWheel'/>
 			<Function name='GetMouseX'/>
 			<Function name='GetMouseY'/>
 		</Class>
@@ -887,7 +888,79 @@
 			<Function name='GetStepsQueueWrapped'/>
 		</Class>
 		<Class name='PlayerOptions'>
+			<Function name='GetAlternate'/>
+			<Function name='GetAttackMines'/>
+			<Function name='GetBMRize'/>
+			<Function name='GetBeat'/>
+			<Function name='GetBig'/>
+			<Function name='GetBlind'/>
+			<Function name='GetBlink'/>
+			<Function name='GetBoomerang'/>
+			<Function name='GetBoost'/>
+			<Function name='GetBrake'/>
+			<Function name='GetBumpy'/>
+			<Function name='GetCMod'/>
+			<Function name='GetCentered'/>
+			<Function name='GetConfusion'/>
+			<Function name='GetCover'/>
+			<Function name='GetCross'/>
+			<Function name='GetDark'/>
+			<Function name='GetDizzy'/>
+			<Function name='GetDrunk'/>
+			<Function name='GetEcho'/>
+			<Function name='GetExpand'/>
+			<Function name='GetFlip'/>
+			<Function name='GetFloored'/>
+			<Function name='GetHidden'/>
+			<Function name='GetHiddenOffset'/>
+			<Function name='GetHoldRolls'/>
+			<Function name='GetInvert'/>
+			<Function name='GetLeft'/>
+			<Function name='GetLittle'/>
+			<Function name='GetMines'/>
+			<Function name='GetMini'/>
+			<Function name='GetMirror'/>
+			<Function name='GetNoFakes'/>
+			<Function name='GetNoHands'/>
+			<Function name='GetNoHolds'/>
+			<Function name='GetNoJumps'/>
+			<Function name='GetNoLifts'/>
+			<Function name='GetNoMines'/>
+			<Function name='GetNoQuads'/>
+			<Function name='GetNoRolls'/>
+			<Function name='GetNoStretch'/>
 			<Function name='GetNoteSkin'/>
+			<Function name='GetPassmark'/>
+			<Function name='GetPlanted'/>
+			<Function name='GetQuick'/>
+			<Function name='GetRandomAttacks'/>
+			<Function name='GetRandomSpeed'/>
+			<Function name='GetRandomVanish'/>
+			<Function name='GetReverse'/>
+			<Function name='GetReversePercentForColumn'/>
+			<Function name='GetRight'/>
+			<Function name='GetRoll'/>
+			<Function name='GetShuffle'/>
+			<Function name='GetSkew'/>
+			<Function name='GetSkippy'/>
+			<Function name='GetSoftShuffle'/>
+			<Function name='GetSongAttacks'/>
+			<Function name='GetSplit'/>
+			<Function name='GetStealth'/>
+			<Function name='GetStomp'/>
+			<Function name='GetSudden'/>
+			<Function name='GetSuddenOffset'/>
+			<Function name='GetSuperShuffle'/>
+			<Function name='GetTiny'/>
+			<Function name='GetTipsy'/>
+			<Function name='GetTornado'/>
+			<Function name='GetTwirl'/>
+			<Function name='GetTwister'/>
+			<Function name='GetWave'/>
+			<Function name='GetWide'/>
+			<Function name='GetXMod'/>
+			<Function name='GetXMode'/>
+			<Function name='SetNoteSkin'/>
 		</Class>
 		<Class name='PlayerStageStats'>
 			<Function name='FullCombo'/>
@@ -1993,5 +2066,5 @@
 		<Constant name='top' value='&apos;VertAlign_Top&apos;'/>
 	</Constants>
 	<Version>sm-ssc v1.2.3</Version>
-	<Date>2011-03-15</Date>
+	<Date>2011-03-20</Date>
 </Lua>

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]

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"
 }

Themes/_fallback/metrics.ini

@@ -1664,9 +1664,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"
@@ -1674,7 +1672,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
@@ -1723,87 +1720,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"

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 )