From 39580f80851b6520b6e0de8286619ec8bf3b3da5 Mon Sep 17 00:00:00 2001 From: MinaciousGrace Date: Sun, 14 May 2017 22:37:09 -0400 Subject: [PATCH] use the current rate mod as the base when adding a chart to a playlist --- src/SongManager.cpp | 11 ++++++++++- src/SongManager.h | 2 +- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/src/SongManager.cpp b/src/SongManager.cpp index e121345f49..7b0be18ace 100644 --- a/src/SongManager.cpp +++ b/src/SongManager.cpp @@ -155,7 +155,6 @@ void Chart::FromKey(const string& ck) { loaded = true; songptr = song; stepsptr = steps; - LOG->Trace(songptr->GetDisplayMainTitle()); return; } loaded = false; @@ -185,6 +184,16 @@ void Chart::LoadFromNode(const XNode* node) { FromKey(key); } +void Playlist::AddChart(const string & ck) +{ + float rate = GAMESTATE->m_SongOptions.GetCurrent().m_fMusicRate; + Chart ch; + ch.FromKey(ck); + ch.rate = rate; + chartlist.emplace_back(ch); + chartrates.emplace_back(rate); +} + XNode* Playlist::CreateNode() const { XNode* pl = new XNode("Playlist"); pl->AppendAttr("Name", name); diff --git a/src/SongManager.h b/src/SongManager.h index 490ae716bb..0be1c7b66b 100644 --- a/src/SongManager.h +++ b/src/SongManager.h @@ -53,7 +53,7 @@ struct Playlist { vector chartlist; vector chartrates; void Add(Chart ch) { chartlist.emplace_back(ch); } - void AddChart(const string& ck) { Chart ch; ch.FromKey(ck); chartlist.emplace_back(ch); chartrates.emplace_back(1.f); } + void AddChart(const string& ck); void SwapPosition(); void Create();