From a1aaf98c3b9f5271067eac79a406c8b51172edf6 Mon Sep 17 00:00:00 2001 From: Nicolas Date: Mon, 11 Feb 2019 20:05:30 -0300 Subject: [PATCH 01/15] Remove extra qualification on method (clang error) --- src/GameSoundManager.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/GameSoundManager.h b/src/GameSoundManager.h index 151b36c4e9..70c97c4883 100644 --- a/src/GameSoundManager.h +++ b/src/GameSoundManager.h @@ -67,7 +67,7 @@ class GameSoundManager float GetFrameTimingAdjustment(float fDeltaTime); static float GetPlayerBalance(PlayerNumber pn); - void GameSoundManager::WithRageSoundPlaying(function f); + void WithRageSoundPlaying(function f); TimingData GetPlayingMusicTiming(); void StartMusic(MusicToPlay& ToPlay); From d9b318e67333d4fd5536f3b1cc2d5db0f0576dcd Mon Sep 17 00:00:00 2001 From: poco0317 Date: Mon, 11 Feb 2019 21:28:47 -0600 Subject: [PATCH 02/15] Remove repetitive preview toggle --- .../BGAnimations/ScreenSelectMusic decorations/wifeTwirl.lua | 1 - 1 file changed, 1 deletion(-) diff --git a/Themes/Til Death/BGAnimations/ScreenSelectMusic decorations/wifeTwirl.lua b/Themes/Til Death/BGAnimations/ScreenSelectMusic decorations/wifeTwirl.lua index 2f1bc8731f..3e328d99cd 100644 --- a/Themes/Til Death/BGAnimations/ScreenSelectMusic decorations/wifeTwirl.lua +++ b/Themes/Til Death/BGAnimations/ScreenSelectMusic decorations/wifeTwirl.lua @@ -747,7 +747,6 @@ t[#t + 1] = if noteField and oldstyle ~= GAMESTATE:GetCurrentStyle() then SCREENMAN:GetTopScreen():DeletePreviewNoteField(mcbootlarder) noteField = false - toggleNoteField() SCREENMAN:GetTopScreen():setTimeout( function() toggleNoteField() From 6bd38dc9757f4a7d850babfddddd9dcbc59a5cb4 Mon Sep 17 00:00:00 2001 From: poco0317 Date: Mon, 11 Feb 2019 22:28:38 -0600 Subject: [PATCH 03/15] Improve playback for preview when switching style Correct positioning, worse playback experience (this will never be perfect) --- .../ScreenSelectMusic decorations/wifeTwirl.lua | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/Themes/Til Death/BGAnimations/ScreenSelectMusic decorations/wifeTwirl.lua b/Themes/Til Death/BGAnimations/ScreenSelectMusic decorations/wifeTwirl.lua index 3e328d99cd..c98e9d447f 100644 --- a/Themes/Til Death/BGAnimations/ScreenSelectMusic decorations/wifeTwirl.lua +++ b/Themes/Til Death/BGAnimations/ScreenSelectMusic decorations/wifeTwirl.lua @@ -14,6 +14,7 @@ local prevY = 55 local prevrevY = 208 local boolthatgetssettotrueonsongchangebutonlyifonatabthatisntthisone = false local boolthatgetssettotrueonsongchangebutonlyifonthegeneraltabandthepreviewhasbeentoggledoff = false +local songChanged = false local update = false local t = @@ -37,6 +38,7 @@ local t = if getTabIndex() == 0 and noteField and not mcbootlarder:GetChild("NoteField"):IsVisible() then boolthatgetssettotrueonsongchangebutonlyifonthegeneraltabandthepreviewhasbeentoggledoff = true end + songChanged = true end, MintyFreshCommand = function(self) self:finishtweening() @@ -137,7 +139,10 @@ local function toggleNoteField() if usingreverse then mcbootlarder:GetChild("NoteField"):y(prevY * 1.5 + prevrevY) end - song:Borp() -- catches a dumb bug that isn't worth explaining -mina + if songChanged then + song:Borp() -- catches a dumb bug that isn't worth explaining -mina + songChanged = false + end return end From 9dd484848425bede6a2c06f64619ce084c231f2a Mon Sep 17 00:00:00 2001 From: poco0317 Date: Tue, 12 Feb 2019 13:46:56 -0600 Subject: [PATCH 04/15] Fix oddities with judge counter and error bar --- .../WifeJudgmentSpotting.lua | 28 +++++++++++-------- 1 file changed, 17 insertions(+), 11 deletions(-) diff --git a/Themes/Til Death/BGAnimations/ScreenGameplay overlay/WifeJudgmentSpotting.lua b/Themes/Til Death/BGAnimations/ScreenGameplay overlay/WifeJudgmentSpotting.lua index 1a3c79e11e..da82b4c706 100644 --- a/Themes/Til Death/BGAnimations/ScreenGameplay overlay/WifeJudgmentSpotting.lua +++ b/Themes/Til Death/BGAnimations/ScreenGameplay overlay/WifeJudgmentSpotting.lua @@ -31,6 +31,9 @@ local positive = getMainColor("positive") local highlight = getMainColor("highlight") local negative = getMainColor("negative") +local jdgCounts = {} -- Child references for the judge counter + + -- We can also pull in some localized aliases for workhorse functions for a modest speed increase local Round = notShit.round local Floor = notShit.floor @@ -209,11 +212,11 @@ local t = jdgct = msg.Val if msg.Offset ~= nil then dvCur = msg.Offset - else - dvCur = 1000 end jdgCur = msg.Judgment - queuecommand(self, "SpottedOffset") + if jdgCounts[jdgCur] ~= nil then + queuecommand(self, "SpottedOffset") + end end } @@ -298,7 +301,7 @@ else end self:settextf("") end, - JudgmentMessageCommand = function(self, msg) + SpottedOffsetCommand = function(self, msg) if tDiff then local pbtarget = msg.WifePBGoal if tDiff >= 0 then @@ -387,7 +390,6 @@ local countFontSize = 0.35 local gradeFontSize = 0.45 --==--==--==--==--==--==--==--==--==--==--==--==--==--==--==--==--==--==--==--==--==--==--==--==--==--==--==--==--==--==--==--==--==--==-- -local jdgCounts = {} -- Child references for the judge counter local j = Def.ActorFrame { @@ -405,7 +407,7 @@ local j = end end, SpottedOffsetCommand = function(self) - if jdgCur then + if jdgCur and jdgCounts[jdgCur] ~= nil then settext(jdgCounts[jdgCur], jdgct) end end, @@ -513,8 +515,10 @@ local e = end, SpottedOffsetCommand = function(self) if enabledErrorBar == 1 then - currentbar = ((currentbar) % barcount) + 1 - queuecommand(ingots[currentbar], "UpdateErrorBar") -- Update the next bar in the queue + if jdgCounts[jdgCur] ~= nil and jdgCur ~= "HoldNoteScore_LetGo" and jdgCur ~= "TapNoteScore_Miss" then + currentbar = ((currentbar) % barcount) + 1 + queuecommand(ingots[currentbar], "UpdateErrorBar") -- Update the next bar in the queue + end end end, DootCommand = function(self) @@ -577,9 +581,11 @@ if enabledErrorBar == 2 then end end, SpottedOffsetCommand = function(self) - avg = alpha * dvCur + (1 - alpha) * lastAvg - lastAvg = avg - self:x(MovableValues.ErrorBarX + avg * wscale) + if jdgCounts[jdgCur] and jdgCur ~= "HoldNoteScore_LetGo" and jdgCur~= "TapNoteScore_Miss" then + avg = alpha * dvCur + (1 - alpha) * lastAvg + lastAvg = avg + self:x(MovableValues.ErrorBarX + avg * wscale) + end end } end From befd19d94d85c1705429952289e4d4b94b7d9c03 Mon Sep 17 00:00:00 2001 From: poco0317 Date: Tue, 12 Feb 2019 14:05:46 -0600 Subject: [PATCH 05/15] Improve logic for cleartypes & enable SDCB --- Themes/Til Death/Scripts/ClearType.lua | 40 ++++++++++++++++---------- 1 file changed, 25 insertions(+), 15 deletions(-) diff --git a/Themes/Til Death/Scripts/ClearType.lua b/Themes/Til Death/Scripts/ClearType.lua index be474c145c..5e3b6edc59 100644 --- a/Themes/Til Death/Scripts/ClearType.lua +++ b/Themes/Til Death/Scripts/ClearType.lua @@ -106,26 +106,36 @@ local function clearTypes(grade, playCount, perfcount, greatcount, misscount, re else if grade == "Grade_Failed" then -- failed clearlevel = 11 - elseif perfcount < 10 and perfcount > 1 then -- SDP - clearlevel = 3 - elseif greatcount < 10 and greatcount > 1 then -- SDG - clearlevel = 6 - elseif perfcount == 1 and greatcount + misscount == 0 then -- whiteflag - clearlevel = 2 - elseif greatcount == 1 and misscount == 0 then -- blackflag - clearlevel = 5 - elseif perfcount + greatcount + misscount == 0 then -- MFC - clearlevel = 1 - elseif greatcount + misscount == 0 then -- PFC - clearlevel = 4 - elseif misscount == 0 then -- FC - clearlevel = 7 - else + elseif misscount > 0 then if misscount == 1 then clearlevel = 8 -- missflag + elseif misscount > 1 and misscount < 10 then + clearlevel = 9 -- SDCB else clearlevel = 10 -- Clear end + elseif misscount == 0 then + if greatcount == 0 then + if perfcount == 0 then -- MFC + clearlevel = 1 + elseif perfcount == 1 then -- whiteflag + clearlevel = 2 + elseif perfcount < 10 and perfcount > 1 then -- SDP + clearlevel = 3 + else -- PFC + clearlevel = 4 + end + else + if greatcount < 10 and greatcount > 1 then -- SDG + clearlevel = 6 + elseif greatcount == 1 then -- blackflag + clearlevel = 5 + else -- FC + clearlevel = 7 + end + end + else + clearlevel = 12 -- this would mean negative misses end end return getClearTypeItem(clearlevel, returntype) From fe3b10d2a110461fc10d178a6cdf24bf223b628a Mon Sep 17 00:00:00 2001 From: poco0317 Date: Tue, 12 Feb 2019 14:05:56 -0600 Subject: [PATCH 06/15] Give SDCB a color --- Themes/Til Death/Scripts/01 color_config.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Themes/Til Death/Scripts/01 color_config.lua b/Themes/Til Death/Scripts/01 color_config.lua index 9a3b91662d..1db42334c4 100644 --- a/Themes/Til Death/Scripts/01 color_config.lua +++ b/Themes/Til Death/Scripts/01 color_config.lua @@ -27,7 +27,7 @@ local defaultConfig = { SDG = "#448844", FC = "#66cc66", MF = "#cc6666", - SDCB = "#666666", + SDCB = "#33bbff", Clear = "#33aaff", Failed = "#e61e25", Invalid = "#e61e25", From df8b7bb55bb5b37cc7413fe1e2f7a433f4977223 Mon Sep 17 00:00:00 2001 From: poco0317 Date: Tue, 12 Feb 2019 14:41:46 -0600 Subject: [PATCH 07/15] Make login/logout button highlight --- Themes/Til Death/BGAnimations/_PlayerInfo.lua | 61 +++++++++++++++++-- 1 file changed, 56 insertions(+), 5 deletions(-) diff --git a/Themes/Til Death/BGAnimations/_PlayerInfo.lua b/Themes/Til Death/BGAnimations/_PlayerInfo.lua index 74e1425720..8f36ed5d3c 100644 --- a/Themes/Til Death/BGAnimations/_PlayerInfo.lua +++ b/Themes/Til Death/BGAnimations/_PlayerInfo.lua @@ -25,6 +25,11 @@ local function highlight(self) self:GetChild("refreshbutton"):queuecommand("Highlight") end +local function highlight2(self) + self:GetChild("refreshbutton"):queuecommand("Highlight") + self:GetChild("loginlogout"):queuecommand("Highlight") +end + local function highlightIfOver(self) if isOver(self) then self:diffusealpha(0.6) @@ -109,8 +114,9 @@ t[#t + 1] = }, LoadFont("Common Normal") .. { + Name = "loginlogout", InitCommand = function(self) - self:xy(SCREEN_CENTER_X, AvatarY + 20):halign(0.5):zoom(0.5):diffuse(getMainColor("positive")) + self:xy(SCREEN_CENTER_X, AvatarY + 26):halign(0.5):zoom(0.5):diffuse(getMainColor("positive")) end, BeginCommand = function(self) self:queuecommand("Set") @@ -126,18 +132,59 @@ t[#t + 1] = if SCREENMAN:GetTopScreen():GetName() == "ScreenSelectMusic" then self:settext("Click to login") else - self:settextf("Not logged in") + self:settext("Not logged in") + end + end, + LoginMessageCommand = function(self) --this seems a little clunky -mina + if SCREENMAN:GetTopScreen() and SCREENMAN:GetTopScreen():GetName() == "ScreenSelectMusic" then + self:settextf( + "%s", + "Click to Logout" + ) + else + self:settextf("") + end + end, + OnlineUpdateMessageCommand = function(self) + self:queuecommand("Set") + end, + HighlightCommand=function(self) + highlightIfOver(self) + end + }, + LoadFont("Common Normal") .. + { + InitCommand = function(self) + self:xy(SCREEN_CENTER_X, AvatarY + 20):halign(0.5):zoom(0.5):diffuse(getMainColor("positive")) + end, + BeginCommand = function(self) + self:queuecommand("Set") + end, + SetCommand = function(self) + if DLMAN:IsLoggedIn() then + self:queuecommand("Login") + else + self:queuecommand("LogOut") + end + end, + LogOutMessageCommand = function(self) + if SCREENMAN:GetTopScreen():GetName() == "ScreenSelectMusic" then + self:settextf("") + self:GetParent():SetUpdateFunction(highlight2) + else + self:settextf("") + self:GetParent():SetUpdateFunction(highlight) end end, LoginMessageCommand = function(self) --this seems a little clunky -mina if SCREENMAN:GetTopScreen() and SCREENMAN:GetTopScreen():GetName() == "ScreenSelectMusic" then self:settextf( - "Logged in as %s (%5.2f: #%i) \n%s", + "Logged in as %s (%5.2f: #%i) \n", DLMAN:GetUsername(), DLMAN:GetSkillsetRating("Overall"), - DLMAN:GetSkillsetRank(ms.SkillSets[1]), - "Click to Logout" + DLMAN:GetSkillsetRank(ms.SkillSets[1]) ) + self:GetParent():SetUpdateFunction(highlight2) else self:settextf( "Logged in as %s (%5.2f: #%i)", @@ -145,10 +192,14 @@ t[#t + 1] = DLMAN:GetSkillsetRating("Overall"), DLMAN:GetSkillsetRank(ms.SkillSets[1]) ) + self:GetParent():SetUpdateFunction(highlight) end end, OnlineUpdateMessageCommand = function(self) self:queuecommand("Set") + end, + HighlightCommand=function(self) + highlightIfOver(self) end }, Def.Quad { From 946e97083bf75d1d9cd85df7ce3c1af483f7e7bc Mon Sep 17 00:00:00 2001 From: poco0317 Date: Tue, 12 Feb 2019 15:42:28 -0600 Subject: [PATCH 08/15] Fix offline gameplay leaderboard --- .../BGAnimations/ScreenGameplay overlay/leaderboard.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Themes/Til Death/BGAnimations/ScreenGameplay overlay/leaderboard.lua b/Themes/Til Death/BGAnimations/ScreenGameplay overlay/leaderboard.lua index 26eb2c2a80..5e0dfc1baf 100644 --- a/Themes/Til Death/BGAnimations/ScreenGameplay overlay/leaderboard.lua +++ b/Themes/Til Death/BGAnimations/ScreenGameplay overlay/leaderboard.lua @@ -82,7 +82,7 @@ curScore = { return DLMAN:GetUsername() end, GetWifeGrade = function() - return curScore.curGrade + return GetGradeFromPercent(curScore.curWifeScore) end, GetWifeScore = function() return curScore.curWifeScore From f55e7654e1d5c13ba481a16a43e458bc17771419 Mon Sep 17 00:00:00 2001 From: poco0317 Date: Tue, 12 Feb 2019 16:18:58 -0600 Subject: [PATCH 09/15] Slightly improve chart leaderboard requests entering SSM --- src/ScreenSelectMusic.cpp | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/ScreenSelectMusic.cpp b/src/ScreenSelectMusic.cpp index a256cad3a1..882cc9f1fa 100644 --- a/src/ScreenSelectMusic.cpp +++ b/src/ScreenSelectMusic.cpp @@ -271,7 +271,10 @@ ScreenSelectMusic::BeginScreen() GAMESTATE->isplaylistcourse = false; SONGMAN->playlistcourse = ""; } - if (GAMESTATE->m_pCurSteps != nullptr) + + // Update the leaderboard for the file we may have just left + // If it was empty, just let the players request it themselves (to prevent a theme bug) + if (GAMESTATE->m_pCurSteps != nullptr && DLMAN->chartLeaderboards.count(GAMESTATE->m_pCurSteps->GetChartKey()) != 0) DLMAN->RequestChartLeaderBoard( GAMESTATE->m_pCurSteps->GetChartKey()); From b7c86511e1c5789a90a10f5e2670466a77ee05a9 Mon Sep 17 00:00:00 2001 From: poco0317 Date: Tue, 12 Feb 2019 16:35:54 -0600 Subject: [PATCH 10/15] Fix chart leaderboards not updating when changing diff --- .../ScreenSelectMusic decorations/score.lua | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/Themes/Til Death/BGAnimations/ScreenSelectMusic decorations/score.lua b/Themes/Til Death/BGAnimations/ScreenSelectMusic decorations/score.lua index 39c398b58e..53de38943c 100644 --- a/Themes/Til Death/BGAnimations/ScreenSelectMusic decorations/score.lua +++ b/Themes/Til Death/BGAnimations/ScreenSelectMusic decorations/score.lua @@ -69,12 +69,17 @@ local function updateLeaderBoardForCurrentChart() if top:GetMusicWheel():IsSettled() and ((getTabIndex() == 2 and nestedTab == 2) or collapsed) then local steps = GAMESTATE:GetCurrentSteps(PLAYER_1) if steps then - DLMAN:RequestChartLeaderBoardFromOnline( - steps:GetChartKey(), - function(leaderboard) - moped:queuecommand("SetFromLeaderboard", leaderboard) - end - ) + local leaderboardAttempt = DLMAN:GetChartLeaderboard(steps:GetChartKey()) + if #leaderboardAttempt > 0 then + moped:playcommand("SetFromLeaderboard", leaderboardAttempt) + else + DLMAN:RequestChartLeaderBoardFromOnline( + steps:GetChartKey(), + function(leaderboard) + moped:queuecommand("SetFromLeaderboard", leaderboard) + end + ) + end else moped:playcommand("SetFromLeaderboard", {}) end From a2c102dce68b3919f3ab3989d8ba27bce92fb1c4 Mon Sep 17 00:00:00 2001 From: poco0317 Date: Tue, 12 Feb 2019 16:40:52 -0600 Subject: [PATCH 11/15] Stop completed holds from showing up on the error bar --- .../ScreenGameplay overlay/WifeJudgmentSpotting.lua | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Themes/Til Death/BGAnimations/ScreenGameplay overlay/WifeJudgmentSpotting.lua b/Themes/Til Death/BGAnimations/ScreenGameplay overlay/WifeJudgmentSpotting.lua index da82b4c706..c8d85d9633 100644 --- a/Themes/Til Death/BGAnimations/ScreenGameplay overlay/WifeJudgmentSpotting.lua +++ b/Themes/Til Death/BGAnimations/ScreenGameplay overlay/WifeJudgmentSpotting.lua @@ -515,7 +515,7 @@ local e = end, SpottedOffsetCommand = function(self) if enabledErrorBar == 1 then - if jdgCounts[jdgCur] ~= nil and jdgCur ~= "HoldNoteScore_LetGo" and jdgCur ~= "TapNoteScore_Miss" then + if jdgCounts[jdgCur] ~= nil and jdgCur ~= "HoldNoteScore_LetGo" and jdgCur ~= "TapNoteScore_Miss" and jdgCur ~= "HoldNoteScore_Held" then currentbar = ((currentbar) % barcount) + 1 queuecommand(ingots[currentbar], "UpdateErrorBar") -- Update the next bar in the queue end @@ -581,7 +581,7 @@ if enabledErrorBar == 2 then end end, SpottedOffsetCommand = function(self) - if jdgCounts[jdgCur] and jdgCur ~= "HoldNoteScore_LetGo" and jdgCur~= "TapNoteScore_Miss" then + if jdgCounts[jdgCur] and jdgCur ~= "HoldNoteScore_LetGo" and jdgCur ~= "TapNoteScore_Miss" and jdgCur ~= "HoldNoteScore_Held" then avg = alpha * dvCur + (1 - alpha) * lastAvg lastAvg = avg self:x(MovableValues.ErrorBarX + avg * wscale) From b84ced4e1a47fb9a753552b37c7d1478466e5a50 Mon Sep 17 00:00:00 2001 From: poco0317 Date: Tue, 12 Feb 2019 17:35:51 -0600 Subject: [PATCH 12/15] Fix pb target tracker goal thing filling your screen with errors --- .../ScreenGameplay overlay/WifeJudgmentSpotting.lua | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/Themes/Til Death/BGAnimations/ScreenGameplay overlay/WifeJudgmentSpotting.lua b/Themes/Til Death/BGAnimations/ScreenGameplay overlay/WifeJudgmentSpotting.lua index c8d85d9633..c98b1f33ff 100644 --- a/Themes/Til Death/BGAnimations/ScreenGameplay overlay/WifeJudgmentSpotting.lua +++ b/Themes/Til Death/BGAnimations/ScreenGameplay overlay/WifeJudgmentSpotting.lua @@ -27,6 +27,7 @@ local jdgCur -- Note: only for judgments with OFFSETS, might reorganize a bit l local tDiff local wifey local judgect +local pbtarget local positive = getMainColor("positive") local highlight = getMainColor("highlight") local negative = getMainColor("negative") @@ -213,6 +214,9 @@ local t = if msg.Offset ~= nil then dvCur = msg.Offset end + if msg.WifePBGoal ~= nil then + pbtarget = msg.WifePBGoal + end jdgCur = msg.Judgment if jdgCounts[jdgCur] ~= nil then queuecommand(self, "SpottedOffset") @@ -303,7 +307,6 @@ else end, SpottedOffsetCommand = function(self, msg) if tDiff then - local pbtarget = msg.WifePBGoal if tDiff >= 0 then diffuse(self, color("#00ff00")) else From dd860ff3fdc7b85055dcdd4e8a535f74bb2fccb3 Mon Sep 17 00:00:00 2001 From: poco0317 Date: Tue, 12 Feb 2019 18:17:40 -0600 Subject: [PATCH 13/15] Fix travis and a warning --- src/RageSound.h | 2 +- src/StepMania.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/RageSound.h b/src/RageSound.h index b6a96341d6..185fa3404d 100644 --- a/src/RageSound.h +++ b/src/RageSound.h @@ -185,7 +185,7 @@ class RageSound : public RageSoundBase int64_t m_iStreamFrame; void* fftwBuffer{nullptr}; - void RageSound::ActuallySetPlayBackCallback(LuaReference& f, unsigned int bufSize); + void ActuallySetPlayBackCallback(LuaReference& f, unsigned int bufSize); std::atomic inPlayCallback{ false }; std::mutex recentSamplesMutex; // For all operations related to sound play callbacks unsigned int recentPCMSamplesBufferSize{ 1024 }; diff --git a/src/StepMania.cpp b/src/StepMania.cpp index 61a636770d..b233ce9c9b 100644 --- a/src/StepMania.cpp +++ b/src/StepMania.cpp @@ -990,7 +990,7 @@ WriteLogHeader() now.tm_hour, now.tm_min, now.tm_sec); - LOG->Info("\tVerbosity: " + PREFSMAN->m_verbose_log.ToString()); + LOG->Info("\tVerbosity: %s", PREFSMAN->m_verbose_log.ToString()); LOG->Trace(" "); if (g_argc > 1) { From 87a8df00e99c416be979e97239cfa8b71c25f5ea Mon Sep 17 00:00:00 2001 From: poco0317 Date: Tue, 12 Feb 2019 18:29:10 -0600 Subject: [PATCH 14/15] literally fix travis --- src/StepMania.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/StepMania.cpp b/src/StepMania.cpp index b233ce9c9b..64edf8bf04 100644 --- a/src/StepMania.cpp +++ b/src/StepMania.cpp @@ -990,7 +990,7 @@ WriteLogHeader() now.tm_hour, now.tm_min, now.tm_sec); - LOG->Info("\tVerbosity: %s", PREFSMAN->m_verbose_log.ToString()); + LOG->Info("\tVerbosity: %s", PREFSMAN->m_verbose_log.ToString().c_str()); LOG->Trace(" "); if (g_argc > 1) { From ff7958782b314138296d83832e9930c493994483 Mon Sep 17 00:00:00 2001 From: poco0317 Date: Tue, 12 Feb 2019 21:52:03 -0600 Subject: [PATCH 15/15] Fix pbtarget nil value in gameplay --- .../ScreenGameplay overlay/WifeJudgmentSpotting.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Themes/Til Death/BGAnimations/ScreenGameplay overlay/WifeJudgmentSpotting.lua b/Themes/Til Death/BGAnimations/ScreenGameplay overlay/WifeJudgmentSpotting.lua index c98b1f33ff..ca241ced87 100644 --- a/Themes/Til Death/BGAnimations/ScreenGameplay overlay/WifeJudgmentSpotting.lua +++ b/Themes/Til Death/BGAnimations/ScreenGameplay overlay/WifeJudgmentSpotting.lua @@ -306,7 +306,7 @@ else self:settextf("") end, SpottedOffsetCommand = function(self, msg) - if tDiff then + if pbtarget then if tDiff >= 0 then diffuse(self, color("#00ff00")) else