Skip to content

Commit

Permalink
re-enable and move trial adjustment index to general tab
Browse files Browse the repository at this point in the history
going to leave it commented out by default for the time being, that way anyone who knows what it is and wants to use it can but it won't confuse people needlessly
  • Loading branch information
MinaciousGrace committed Jul 17, 2018
1 parent fe4a4c1 commit 37377c8
Show file tree
Hide file tree
Showing 3 changed files with 31 additions and 26 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down Expand Up @@ -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)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
4 changes: 2 additions & 2 deletions src/DownloadManager.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit 37377c8

Please sign in to comment.