diff --git a/Themes/Til Death/BGAnimations/ScreenSelectMusic decorations/score.lua b/Themes/Til Death/BGAnimations/ScreenSelectMusic decorations/score.lua index a45c4b4604..09752ae14b 100644 --- a/Themes/Til Death/BGAnimations/ScreenSelectMusic decorations/score.lua +++ b/Themes/Til Death/BGAnimations/ScreenSelectMusic decorations/score.lua @@ -520,13 +520,9 @@ function updateNetScores(self) MESSAGEMAN:Broadcast("NetScoreUpdate") end local eosongid -local sordidbeltbuckle -local ferengilovetower local netTab = Def.ActorFrame { ChartLeaderboardUpdateMessageCommand = function(self,params) eosongid = params.songid - sordidbeltbuckle = params.mmm - ferengilovetower = params.ixmixblixb updateNetScores(self) end, UpdateChartMessageCommand=function(self) @@ -810,26 +806,6 @@ local function netscoreitem(drawindex) end, }, - -- weo - LoadFont("Common normal")..{ - InitCommand=function(self) - self:xy(netscoreframeWidth-18,netscoreframey+(drawindex*netscorespacing)+17):zoom(0.65):halign(1):maxwidth(100):valign(1):diffusealpha(0) - end, - SetCommand=function(self) - if tmpScore then - self:settextf("%05.2f | %.2f", sordidbeltbuckle, ferengilovetower) - else - self:settext("") - end - end, - NetScoreUpdateMessageCommand=function(self) - self:queuecommand("Set") - end, - BeginCommand=function(self) - self:queuecommand("Set") - end, - }, - --date LoadFont("Common normal")..{ InitCommand=function(self) diff --git a/Themes/Til Death/BGAnimations/ScreenSelectMusic decorations/wifeTwirl.lua b/Themes/Til Death/BGAnimations/ScreenSelectMusic decorations/wifeTwirl.lua index 5af5e4d25c..752ac135aa 100644 --- a/Themes/Til Death/BGAnimations/ScreenSelectMusic decorations/wifeTwirl.lua +++ b/Themes/Til Death/BGAnimations/ScreenSelectMusic decorations/wifeTwirl.lua @@ -348,6 +348,35 @@ t[#t+1] = LoadFont("Common Large") .. { end, } +-- -- test adjustment index +-- t[#t+1] = LoadFont("Common normal")..{ + -- InitCommand=function(self) + -- self:xy(frameX+92,frameY-70):halign(0):zoom(0.4) + -- end, + -- ChartLeaderboardUpdateMessageCommand = function(self,params) + -- local val = params.mmm + -- if val then + -- if val > 0 then + -- self:settextf("%+5.1f", val) + -- else + -- self:settextf("%5.1f", val) + -- end + -- else + -- self:settext("") + -- end + -- end, + -- LogOutMessageCommand=function(self) + -- self:settext("") + -- end, + -- RefreshChartInfoMessageCommand=function(self) + -- if song then + -- self:visible(true) + -- else + -- self:visible(false) + -- end + -- end, +-- } + -- Song duration t[#t+1] = LoadFont("Common Large") .. { InitCommand=function(self) diff --git a/src/DownloadManager.cpp b/src/DownloadManager.cpp index f0b9ae903e..73b24b0660 100644 --- a/src/DownloadManager.cpp +++ b/src/DownloadManager.cpp @@ -950,9 +950,9 @@ void DownloadManager::RequestChartLeaderBoard(string chartkey) //json failed } - //float zoop = mythicalmathymaths(chartkey); + float zoop = mythicalmathymaths(chartkey); //float coop = ixmixblixb(chartkey); - msg.SetParam("mmm", 1); + msg.SetParam("mmm", zoop); msg.SetParam("ixmixblixb", 2); userswithscores.clear(); // should be ok to free the mem in this way? -mina MESSAGEMAN->Broadcast(msg); // see start of function