YOINK!

Themes/_fallback/Scripts/03 CustomSpeedMods.lua

@@ -263,7 +263,7 @@ function SpeedMods()
 		Choices = GetSpeedMods(),
 
 		LoadSelections = function(self, list, pn)
-			local pMods = GAMESTATE:GetPlayerState(pn):GetPlayerOptions("ModsLevel_Preferred")
+			local pMods = GAMESTATE:GetPlayerState(pn):GetPlayerOptionsString("ModsLevel_Preferred")
 			for i = 1,table.getn(self.Choices) do
 				if string.find(pMods, self.Choices[i]) then
 					list[i] = true

Themes/default/metrics.ini

@@ -140,7 +140,7 @@ Warning10Command=diffuseshift;effectperiod,1;effectcolor2,Color("Red");effectcol
 
 [MusicWheel]
 FadeSeconds=1
-SwitchSeconds=0.10
+SwitchSeconds=0.08
 RandomPicksLockedSongs=true
 RouletteSwitchSeconds=0.05
 RouletteSlowDownSwitches=5
@@ -162,7 +162,7 @@ ScrollBarOnCommand=visible,false
 ;		self:rotationx( rotationx_radians * 180/math.pi );	--[[ to degrees end]] \
 ;	end;
 ItemTransformFunction=function(self,offsetFromCenter,itemIndex,numItems) self:x( (1-math.cos(offsetFromCenter/math.pi))*44 ); self:y( offsetFromCenter*46 ); end
-NumWheelItems=13
+NumWheelItems=11
 MusicWheelSortOnCommand=fov,90;
 MusicWheelSortOffCommand=fov,90;
 MusicWheelItemSortOnCommand=zoomy,0;bounceend,0.15;zoomy,1

src/GameState.cpp

@@ -42,7 +42,6 @@
 #include <ctime>
 #include <set>
 
-
 GameState*	GAMESTATE = NULL;	// global and accessable from anywhere in our program
 
 #define NAME_BLACKLIST_FILE "/Data/NamesBlacklist.txt"
@@ -161,7 +160,7 @@ GameState::GameState() :
 	m_Environment = new LuaTable;
 
 	// Don't reset yet; let the first screen do it, so we can use PREFSMAN and THEME.
-//	Reset();
+	//Reset();
 
 	// Register with Lua.
 	{
@@ -254,7 +253,7 @@ void GameState::Reset()
 		m_MultiPlayerStatus[p] = MultiPlayerStatus_NotJoined;
 	FOREACH_PlayerNumber( pn )
 		MEMCARDMAN->UnlockCard( pn );
-//	m_iCoins = 0;	// don't reset coin count!
+	//m_iCoins = 0;	// don't reset coin count!
 	m_bMultiplayer = false;
 	m_iNumMultiplayerNoteFields = 1;
 	*m_Environment = LuaTable();
@@ -399,7 +398,7 @@ void GameState::UnjoinPlayer( PlayerNumber pn )
 	}
 }
 
-/* handle multiplayer join? */
+/* xxx: handle multiplayer join? -aj */
 
 namespace
 {
@@ -426,7 +425,7 @@ namespace
 	}
 };
 
-// Handle an input that can join a player. Return true if the player joined
+// Handle an input that can join a player. Return true if the player joined.
 bool GameState::JoinInput( PlayerNumber pn )
 {
 	// When AutoJoin is enabled, join all players on a single start press.
@@ -1461,6 +1460,11 @@ void GameState::LoadNoteSkinMetrics( PlayerNumber pn )
 	RString m_sNoteSkin = m_pPlayerState[pn]->m_PlayerOptions.GetStage().m_sNoteSkin;
 	RString sStepsType = StringConversion::ToString( this->m_pCurSteps[pn]->m_StepsType );
 	LOG->Trace("Loading Row/Col/Size values for Noteskin %s | StepsType: %s",m_sNoteSkin.c_str(),sStepsType.c_str());
+
+	//m_iNoteSkinRowSpacing[pn] = NOTESKIN->GetMetricI( m_sNoteSkin, sStepsType, "RowSpacing" );
+	// todo: allow per-column spacing values? -aj
+	m_iNoteSkinColSpacing[pn] = NOTESKIN->GetMetricI( m_sNoteSkin, sStepsType, "ColSpacing" );
+	m_iNoteSkinArrowSize[pn] = NOTESKIN->GetMetricI( m_sNoteSkin, sStepsType, "ArrowSize" );
 }
 */
 

src/GameState.h

@@ -215,8 +215,8 @@ public:
 	BroadcastOnChange<bool> m_bGameplayLeadIn;
 
 	// Metricable noteskin things
-	//void LoadNoteSkinMetrics( PlayerNumber pn );
 	/*
+	void LoadNoteSkinMetrics( PlayerNumber pn );
 	int			m_iNoteSkinColSpacing[NUM_PLAYERS];
 	int			m_iNoteSkinArrowSize[NUM_PLAYERS];
 	*/