[default -> loading window] merge

src/AnnouncerManager.cpp

@@ -37,7 +37,7 @@ void AnnouncerManager::GetAnnouncerNames( vector<RString>& AddTo )
 
 	// strip out the empty announcer folder
 	for( int i=AddTo.size()-1; i>=0; i-- )
-		if( !AddTo[i].EqualsNoCase( EMPTY_ANNOUNCER_NAME ) )
+		if( !stricmp( AddTo[i], EMPTY_ANNOUNCER_NAME ) )
 			AddTo.erase(AddTo.begin()+i, AddTo.begin()+i+1 );
 }
 
@@ -49,7 +49,7 @@ bool AnnouncerManager::DoesAnnouncerExist( RString sAnnouncerName )
 	vector<RString> asAnnouncerNames;
 	GetAnnouncerNames( asAnnouncerNames );
 	for( unsigned i=0; i<asAnnouncerNames.size(); i++ )
-		if( sAnnouncerName.EqualsNoCase(asAnnouncerNames[i]) )
+		if( 0==stricmp(sAnnouncerName, asAnnouncerNames[i]) )
 			return true;
 	return false;
 }

src/NotesLoader.cpp

@@ -40,12 +40,12 @@ bool NotesLoader::LoadFromDir( const RString &sPath, Song &out, set<RString> &Bl
 		SSCLoader::TidyUpData( out, false );
 		return true;
 	}
-	SMLoader::GetApplicableFiles( sPath, list );
-	if (!list.empty() )
-		return SMLoader::LoadFromDir( sPath, out );
 	SMALoader::GetApplicableFiles( sPath, list );
 	if (!list.empty() )
 		return SMALoader::LoadFromDir( sPath, out );
+	SMLoader::GetApplicableFiles( sPath, list );
+	if (!list.empty() )
+		return SMLoader::LoadFromDir( sPath, out );
 	DWILoader::GetApplicableFiles( sPath, list );
 	if( !list.empty() )
 		return DWILoader::LoadFromDir( sPath, out, BlacklistedImages );

src/NotesLoaderSMA.cpp

@@ -337,11 +337,14 @@ void SMALoader::ProcessSpeeds( TimingData &out, const int iRowsPerBeat, const RS
 		
 		const float fBeat = RowToBeat( vs2[0], iRowsPerBeat );
 		
-		unsigned short tmp = ( (vs2[2].find("s") || vs2[2].find("S") )
-				      ? 1 : 0);
+		RString backup = vs2[2];
+		Trim(vs2[2], "s");
+		Trim(vs2[2], "S");
 		
-		SpeedSegment seg(fBeat, StringToFloat( vs2[1] ), StringToFloat(vs2[2]));
-		seg.SetUnit(tmp);
+		unsigned short tmp = ((backup != vs2[2]) ? 1 : 0);
+		
+		SpeedSegment seg(fBeat, StringToFloat( vs2[1] ), StringToFloat(vs2[2]), tmp);
+		//seg.SetUnit(tmp);
 		
 		if( fBeat < 0 )
 		{

src/PrefsManager.cpp

@@ -205,7 +205,7 @@ PrefsManager::PrefsManager() :
 	m_bShowNativeLanguage		( "ShowNativeLanguage",		true ),
 	m_iArcadeOptionsNavigation	( "ArcadeOptionsNavigation",	0 ),
 	m_MusicWheelUsesSections	( "MusicWheelUsesSections",	MusicWheelUsesSections_ALWAYS ),
-	m_iMusicWheelSwitchSpeed	( "MusicWheelSwitchSpeed",	10 ),
+	m_iMusicWheelSwitchSpeed	( "MusicWheelSwitchSpeed",	15 ),
 	m_AllowW1			( "AllowW1",			ALLOW_W1_EVERYWHERE ),
 	m_bEventMode			( "EventMode",			true ),
 	m_iCoinsPerCredit		( "CoinsPerCredit",		1 ),

src/Song.cpp

@@ -1499,7 +1499,14 @@ public:
 	static int GetSongDir( T* p, lua_State *L )		{ lua_pushstring(L, p->GetSongDir() ); return 1; }
 	static int GetMusicPath( T* p, lua_State *L )	{ RString s = p->GetMusicPath(); if( s.empty() ) return 0; lua_pushstring(L, s); return 1; }
 	static int GetBannerPath( T* p, lua_State *L )		{ RString s = p->GetBannerPath(); if( s.empty() ) return 0; LuaHelpers::Push(L, s); return 1; }
-	static int GetBackgroundPath( T* p, lua_State *L )	{ RString s = p->GetBackgroundPath(); if( s.empty() ) return 0; lua_pushstring(L, s); return 1; }
+	static int GetBackgroundPath( T* p, lua_State *L )
+	{
+		RString s = p->GetBackgroundPath();
+		if( s.empty() ) 
+			s = ""; 
+		lua_pushstring(L, s); 
+		return 1; 
+	}
 	static int GetCDTitlePath( T* p, lua_State *L )		{ RString s = p->GetCDTitlePath(); if( s.empty() ) return 0; LuaHelpers::Push(L, s); return 1; }
 	static int GetLyricsPath( T* p, lua_State *L )	{ RString s = p->GetLyricsPath(); if( s.empty() ) return 0; lua_pushstring(L, s); return 1; }
 	static int GetSongFilePath(  T* p, lua_State *L )	{ lua_pushstring(L, p->GetSongFilePath() ); return 1; }