Merge

Docs/Luadoc/Lua.xml

@@ -889,6 +889,11 @@
 		<Class base='ActorFrame' name='ModIconRow'>
 			<Function name='Load'/>
 		</Class>
+		<Class base='WheelBase' name='MusicWheel'>
+			<Function name='IsRouletting'/>
+			<Function name='SelectSong'/>
+			<Function name='SelectCourse'/>
+		</Class>
 		<Class base='Actor' name='Model'>
 			<Function name='GetDefaultAnimation'/>
 			<Function name='GetNumStates'/>

Docs/Luadoc/LuaDocumentation.xml

@@ -2609,6 +2609,17 @@ save yourself some time, copy this for undocumented things:
 		Loads the ModIconRow of Player <code>pn</code> from the Metrics in group <code>sMetricsGroup</code>.
 	</Function>
 </Class>
+<Class name='MusicWheel'>
+	<Function name='IsRouletting' return='bool' arguments=''>
+		Returns <code>true</code> if the MusicWheel is currently handling Roulette selection.
+	</Function>
+	<Function name='SelectSong' return='bool' arguments='Song sSong'>
+		Selects a song. Returns <code>false</code> on failure.
+	</Function>
+	<Function name='SelectCourse' return='bool' arguments='Course cCourse'>
+		Selects a course. Returns <code>false</code> on failure.
+	</Function>
+</Class> 
 <Class name='NoteSkinManager'>
 	<Function name='GetMetricA' return='ActorCommand' arguments='string sElement, string sValue'>
 		Returns a command from the specified element and value.

src/ActorUtil.cpp

@@ -442,6 +442,18 @@ namespace
 		lua_pushboolean( L, IsRegistered(SArg(1)) );
 		return 1;
 	}
+	static int LoadAllCommands( lua_State *L )
+	{
+		Actor *p = Luna<Actor>::check( L, 1 );
+		ActorUtil::LoadAllCommands( p, SArg(2) );
+		return 0;
+	}
+	static int LoadAllCommandsFromName( lua_State *L )
+	{
+		Actor *p = Luna<Actor>::check( L, 1 );
+		ActorUtil::LoadAllCommandsFromName( *p, SArg(2), SArg(3) );
+		return 0;
+	}
 	static int LoadAllCommandsAndSetXY( lua_State *L )
 	{
 		Actor *p = Luna<Actor>::check( L, 1 );

src/MusicWheel.cpp

@@ -1619,10 +1619,33 @@ class LunaMusicWheel: public Luna<MusicWheel>
 {
 public:
 	static int IsRouletting( T* p, lua_State *L ){ lua_pushboolean( L, p->IsRouletting() ); return 1; }
+	static int SelectSong( T* p, lua_State *L )
+	{
+		if( lua_isnil(L,1) ) { lua_pushboolean( L, false ); }
+		else
+		{
+			Song *pS = Luna<Song>::check( L, 1, true );
+			lua_pushboolean( L, p->SelectSong( pS ) );
+		}
+		return 1;
+	}
+	static int SelectCourse( T* p, lua_State *L )
+	{
+		if( lua_isnil(L,1) ) { lua_pushboolean( L, false ); }
+		else
+		{
+			Course *pC = Luna<Course>::check( L, 1, true );
+			lua_pushboolean( L, p->TrySelectCourse( pC ) );
+		}
+		return 1;
+	}
+
 
 	LunaMusicWheel()
 	{
 		ADD_METHOD( IsRouletting );
+		ADD_METHOD( SelectSong );
+		ADD_METHOD( SelectCourse );
 	}
 };
 

src/MusicWheel.h

@@ -1,135 +1,136 @@
-/* MusicWheel - A wheel with song names used in the Select Music screen. */
-
-#ifndef MUSIC_WHEEL_H
-#define MUSIC_WHEEL_H
-
-#include "RageSound.h"
-#include "GameConstantsAndTypes.h"
-#include "MusicWheelItem.h"
-#include "ThemeMetric.h"
-#include "WheelBase.h"
-
-class Course;
-class Song;
-
-struct CompareSongPointerArrayBySectionName;
-
-class MusicWheel : public WheelBase
-{
-	friend struct CompareSongPointerArrayBySectionName;
-
-public:
-	virtual ~MusicWheel();
-	virtual void Load( RString sType );
-	void BeginScreen();
-
-	bool ChangeSort( SortOrder new_so, bool allowSameSort = false );	// return true if change successful
-	bool NextSort();						// return true if change successful
-	void StartRoulette();
-	void StartRandom();
-	bool IsRouletting() const;
-
-	virtual bool Select();				// return true if this selection ends the screen
-	WheelItemDataType	GetSelectedType()	{ return GetCurWheelItemData(m_iSelection)->m_Type; }
-	Song			*GetSelectedSong();
-	Course			*GetSelectedCourse()	{ return GetCurWheelItemData(m_iSelection)->m_pCourse; }
-	RString			GetSelectedSection()	{ return GetCurWheelItemData(m_iSelection)->m_sText; }
-
-	Song *GetPreferredSelectionForRandomOrPortal();
-
-	bool SelectSong( const Song *p );
-	bool SelectSection( const RString & SectionName );
-	void SetOpenSection( RString group );
-	SortOrder GetSortOrder() const { return m_SortOrder; }
-	virtual void ChangeMusic( int dist ); /* +1 or -1 */ //CHECK THIS
-	void FinishChangingSorts();
-	void PlayerJoined();
-	// sm-ssc additions
-	RString JumpToNextGroup();
-	RString JumpToPrevGroup();
-	const MusicWheelItemData *GetCurWheelItemData( int i ) { return (const MusicWheelItemData *) m_CurWheelItemData[i]; }
-
-protected:
-	MusicWheelItem *MakeItem();
-
-	void GetSongList( vector<Song*> &arraySongs, SortOrder so );
-	bool SelectSongOrCourse();
-	bool SelectCourse( const Course *p );
-	bool SelectModeMenuItem();
-
-	virtual void UpdateSwitch();
-
-	vector<MusicWheelItemData *> & getWheelItemsData(SortOrder so);
-	void readyWheelItemsData(SortOrder so);
-
-	RString				m_sLastModeMenuItem;
-	SortOrder			m_SortOrder;
-	RageSound			m_soundChangeSort;
-
-	bool WheelItemIsVisible(int n);
-
-	ThemeMetric<float>		ROULETTE_SWITCH_SECONDS;
-	ThemeMetric<int>		ROULETTE_SLOW_DOWN_SWITCHES;
-	ThemeMetric<int>		NUM_SECTION_COLORS;
-	ThemeMetric<RageColor>		SONG_REAL_EXTRA_COLOR;
-	ThemeMetric<RageColor>		SORT_MENU_COLOR;
-	ThemeMetric<bool>		SHOW_ROULETTE;
-	ThemeMetric<bool>		SHOW_RANDOM;
-	ThemeMetric<bool>		SHOW_PORTAL;
-	ThemeMetric<bool>		RANDOM_PICKS_LOCKED_SONGS;
-	ThemeMetric<int>		MOST_PLAYED_SONGS_TO_SHOW;
-	ThemeMetric<int>		RECENT_SONGS_TO_SHOW;
-	ThemeMetric<RString>		MODE_MENU_CHOICE_NAMES;
-	ThemeMetricMap<RString>		CHOICE;
-	ThemeMetric1D<RageColor>	SECTION_COLORS;
-	ThemeMetric<LuaReference>	SORT_ORDERS;
-	ThemeMetric<bool>		SHOW_EASY_FLAG;
-	// sm-ssc additions:
-	ThemeMetric<bool>		USE_SECTIONS_WITH_PREFERRED_GROUP;
-	ThemeMetric<bool>		HIDE_INACTIVE_SECTIONS;
-	ThemeMetric<bool>		REMIND_WHEEL_POSITIONS;
-	ThemeMetric<RageColor>	ROULETTE_COLOR;
-	ThemeMetric<RageColor>	RANDOM_COLOR;
-	ThemeMetric<RageColor>	PORTAL_COLOR;
-	ThemeMetric<RageColor>	EMPTY_COLOR;
-	vector <int> m_viWheelPositions;
-	ThemeMetric<RString>	CUSTOM_WHEEL_ITEM_NAMES;
-	ThemeMetricMap<RString>	CUSTOM_CHOICES;
-	ThemeMetricMap<RageColor>	CUSTOM_CHOICE_COLORS;
-
-private:
-	//use getWheelItemsData instead of touching this one
-	enum {INVALID,NEEDREFILTER,VALID} m_WheelItemDatasStatus[NUM_SortOrder];
-	vector<MusicWheelItemData *> m__WheelItemDatas[NUM_SortOrder];
-	vector<MusicWheelItemData *> m__UnFilteredWheelItemDatas[NUM_SortOrder];
-
-	void BuildWheelItemDatas( vector<MusicWheelItemData *> &arrayWheelItems, SortOrder so );
-	void FilterWheelItemDatas(vector<MusicWheelItemData *> &aUnFilteredDatas, vector<MusicWheelItemData *> &aFilteredData, SortOrder so );
-};
-
-#endif
-
-/*
- * (c) 2001-2004 Chris Danford, Chris Gomez, Glenn Maynard
- * All rights reserved.
- * 
- * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of this software and associated documentation files (the
- * "Software"), to deal in the Software without restriction, including
- * without limitation the rights to use, copy, modify, merge, publish,
- * distribute, and/or sell copies of the Software, and to permit persons to
- * whom the Software is furnished to do so, provided that the above
- * copyright notice(s) and this permission notice appear in all copies of
- * the Software and that both the above copyright notice(s) and this
- * permission notice appear in supporting documentation.
- * 
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
- * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF
- * THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS
- * INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT
- * OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS
- * OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR
- * OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
- * PERFORMANCE OF THIS SOFTWARE.
- */
+/* MusicWheel - A wheel with song names used in the Select Music screen. */
+
+#ifndef MUSIC_WHEEL_H
+#define MUSIC_WHEEL_H
+
+#include "RageSound.h"
+#include "GameConstantsAndTypes.h"
+#include "MusicWheelItem.h"
+#include "ThemeMetric.h"
+#include "WheelBase.h"
+
+class Course;
+class Song;
+
+struct CompareSongPointerArrayBySectionName;
+
+class MusicWheel : public WheelBase
+{
+	friend struct CompareSongPointerArrayBySectionName;
+
+public:
+	virtual ~MusicWheel();
+	virtual void Load( RString sType );
+	void BeginScreen();
+
+	bool ChangeSort( SortOrder new_so, bool allowSameSort = false );	// return true if change successful
+	bool NextSort();						// return true if change successful
+	void StartRoulette();
+	void StartRandom();
+	bool IsRouletting() const;
+
+	virtual bool Select();				// return true if this selection ends the screen
+	WheelItemDataType	GetSelectedType()	{ return GetCurWheelItemData(m_iSelection)->m_Type; }
+	Song			*GetSelectedSong();
+	Course			*GetSelectedCourse()	{ return GetCurWheelItemData(m_iSelection)->m_pCourse; }
+	RString			GetSelectedSection()	{ return GetCurWheelItemData(m_iSelection)->m_sText; }
+
+	Song *GetPreferredSelectionForRandomOrPortal();
+
+	bool SelectSong( const Song *p );
+	bool TrySelectCourse( const Course *p ){ return TrySelectCourse(p); }
+	bool SelectSection( const RString & SectionName );
+	void SetOpenSection( RString group );
+	SortOrder GetSortOrder() const { return m_SortOrder; }
+	virtual void ChangeMusic( int dist ); /* +1 or -1 */ //CHECK THIS
+	void FinishChangingSorts();
+	void PlayerJoined();
+	// sm-ssc additions
+	RString JumpToNextGroup();
+	RString JumpToPrevGroup();
+	const MusicWheelItemData *GetCurWheelItemData( int i ) { return (const MusicWheelItemData *) m_CurWheelItemData[i]; }
+
+protected:
+	MusicWheelItem *MakeItem();
+
+	void GetSongList( vector<Song*> &arraySongs, SortOrder so );
+	bool SelectSongOrCourse();
+	bool SelectCourse( const Course *p );
+	bool SelectModeMenuItem();
+
+	virtual void UpdateSwitch();
+
+	vector<MusicWheelItemData *> & getWheelItemsData(SortOrder so);
+	void readyWheelItemsData(SortOrder so);
+
+	RString				m_sLastModeMenuItem;
+	SortOrder			m_SortOrder;
+	RageSound			m_soundChangeSort;
+
+	bool WheelItemIsVisible(int n);
+
+	ThemeMetric<float>		ROULETTE_SWITCH_SECONDS;
+	ThemeMetric<int>		ROULETTE_SLOW_DOWN_SWITCHES;
+	ThemeMetric<int>		NUM_SECTION_COLORS;
+	ThemeMetric<RageColor>		SONG_REAL_EXTRA_COLOR;
+	ThemeMetric<RageColor>		SORT_MENU_COLOR;
+	ThemeMetric<bool>		SHOW_ROULETTE;
+	ThemeMetric<bool>		SHOW_RANDOM;
+	ThemeMetric<bool>		SHOW_PORTAL;
+	ThemeMetric<bool>		RANDOM_PICKS_LOCKED_SONGS;
+	ThemeMetric<int>		MOST_PLAYED_SONGS_TO_SHOW;
+	ThemeMetric<int>		RECENT_SONGS_TO_SHOW;
+	ThemeMetric<RString>		MODE_MENU_CHOICE_NAMES;
+	ThemeMetricMap<RString>		CHOICE;
+	ThemeMetric1D<RageColor>	SECTION_COLORS;
+	ThemeMetric<LuaReference>	SORT_ORDERS;
+	ThemeMetric<bool>		SHOW_EASY_FLAG;
+	// sm-ssc additions:
+	ThemeMetric<bool>		USE_SECTIONS_WITH_PREFERRED_GROUP;
+	ThemeMetric<bool>		HIDE_INACTIVE_SECTIONS;
+	ThemeMetric<bool>		REMIND_WHEEL_POSITIONS;
+	ThemeMetric<RageColor>	ROULETTE_COLOR;
+	ThemeMetric<RageColor>	RANDOM_COLOR;
+	ThemeMetric<RageColor>	PORTAL_COLOR;
+	ThemeMetric<RageColor>	EMPTY_COLOR;
+	vector <int> m_viWheelPositions;
+	ThemeMetric<RString>	CUSTOM_WHEEL_ITEM_NAMES;
+	ThemeMetricMap<RString>	CUSTOM_CHOICES;
+	ThemeMetricMap<RageColor>	CUSTOM_CHOICE_COLORS;
+
+private:
+	//use getWheelItemsData instead of touching this one
+	enum {INVALID,NEEDREFILTER,VALID} m_WheelItemDatasStatus[NUM_SortOrder];
+	vector<MusicWheelItemData *> m__WheelItemDatas[NUM_SortOrder];
+	vector<MusicWheelItemData *> m__UnFilteredWheelItemDatas[NUM_SortOrder];
+
+	void BuildWheelItemDatas( vector<MusicWheelItemData *> &arrayWheelItems, SortOrder so );
+	void FilterWheelItemDatas(vector<MusicWheelItemData *> &aUnFilteredDatas, vector<MusicWheelItemData *> &aFilteredData, SortOrder so );
+};
+
+#endif
+
+/*
+ * (c) 2001-2004 Chris Danford, Chris Gomez, Glenn Maynard
+ * All rights reserved.
+ * 
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the
+ * "Software"), to deal in the Software without restriction, including
+ * without limitation the rights to use, copy, modify, merge, publish,
+ * distribute, and/or sell copies of the Software, and to permit persons to
+ * whom the Software is furnished to do so, provided that the above
+ * copyright notice(s) and this permission notice appear in all copies of
+ * the Software and that both the above copyright notice(s) and this
+ * permission notice appear in supporting documentation.
+ * 
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF
+ * THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS
+ * INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT
+ * OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS
+ * OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR
+ * OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+ * PERFORMANCE OF THIS SOFTWARE.
+ */

src/Steps.cpp

@@ -108,7 +108,27 @@ bool Steps::GetNoteDataFromSimfile()
 	if (extension.empty() || extension == "ssc") // remember cache files.
 	{
 		SSCLoader loader;
-		return loader.LoadNoteDataFromSimfile(stepFile, *this);
+		if ( ! loader.LoadNoteDataFromSimfile(stepFile, *this) )
+		{
+			/*
+			HACK: 7/20/12 -- see bugzilla #740
+			users who edit songs using the ever popular .sm file
+			that remove or tamper with the .ssc file later on 
+			complain of blank steps in the editor after reloading.
+			Despite the blank steps being well justified since 
+			the cache files contain only the SSC step file,
+			give the user some leeway and search for a .sm replacement
+			*/
+			SMLoader backup_loader;
+			RString transformedStepFile = stepFile;
+			transformedStepFile.Replace(".ssc", ".sm");
+			
+			return backup_loader.LoadNoteDataFromSimfile(transformedStepFile, *this);
+		}
+		else
+		{
+			return true;
+		}
 	}
 	else if (extension == "sm")
 	{