load hasgoal status for existing goals and send said bool to lua

jameskr97 · Apr 28, 2017 · e918b68 · e918b68
1 parent d366e66
commit e918b68
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 0 deletions.
diff --git a/src/MusicWheelItem.cpp b/src/MusicWheelItem.cpp
@@ -408,6 +408,8 @@ void MusicWheelItem::RefreshGrades()
 		{
 			if(pWID->m_pSong->IsFavorited())
 				msg.SetParam( "Favorited", 1);
+			if (pWID->m_pSong->HasGoal())
+				msg.SetParam("HasGoal", 1);
 			msg.SetParam( "Grade", BestpHSL->HighGrade);
 			msg.SetParam( "Difficulty", DifficultyToString(dcBest));
 			msg.SetParam( "NumTimesPlayed", BestpHSL->GetNumTimesPlayed() );

diff --git a/src/Song.h b/src/Song.h
@@ -426,6 +426,10 @@ class Song
 
 	bool IsFavorited() { return isfavorited; }
 	void SetFavorited(bool b) { isfavorited = b; }
+	bool HasGoal () { return hasgoal; }
+	void SetHasGoal(bool b) { hasgoal = b; }
+	bool IsPermaMirror() { return permamirror; }
+	void SetPermaMirror(bool b) { permamirror = b; }
 
 	void SetEnabled( bool b ) { m_bEnabled = b; }
 	bool GetEnabled() const { return m_bEnabled; }
@@ -473,6 +477,8 @@ class Song
 
 private:
 	bool isfavorited = false;
+	bool permamirror = false;
+	bool hasgoal = false;
 	bool m_loaded_from_autosave;
 	/** @brief the Steps that belong to this Song. */
 	vector<Steps*> m_vpSteps;

diff --git a/src/SongManager.cpp b/src/SongManager.cpp
@@ -626,6 +626,18 @@ void SongManager::SetFavoritedStatus(vector<RString>& favs) {
 	}
 }
 
+// hurr should probably redo both of these -mina
+void SongManager::SetHasGoal(map<RString, vector<ScoreGoal>> goalmap) {
+	FOREACH(Song*, m_pSongs, song) {
+		FOREACH_CONST(Steps*, (*song)->GetAllSteps(), steps) {
+			RString sck = (*steps)->GetChartKey();
+			auto it = goalmap.find(sck);
+			if(it != goalmap.end())
+					(*song)->SetHasGoal(true);
+			}
+		}
+	}
+
 RString SongManager::GetSongGroupBannerPath( const RString &sSongGroup ) const
 {
 	for( unsigned i = 0; i < m_sSongGroupNames.size(); ++i )

diff --git a/src/SongManager.h b/src/SongManager.h
@@ -18,6 +18,7 @@ struct lua_State;
 #include "ThemeMetric.h"
 #include "RageTexturePreloader.h"
 #include "RageUtil.h"
+#include "Profile.h"
 
 RString SONG_GROUP_COLOR_NAME( size_t i );
 RString COURSE_GROUP_COLOR_NAME( size_t i );
@@ -70,6 +71,7 @@ class SongManager
 
 	bool IsGroupNeverCached(const RString& group) const;
 	void SetFavoritedStatus(vector<RString>& favs);
+	void SetHasGoal(map<RString, vector<ScoreGoal>> goalmap);
 
 	RString GetSongGroupBannerPath( const RString &sSongGroup ) const;
 	//RString GetSongGroupBackgroundPath( RString sSongGroup ) const;