Skip to content

Commit dbf69bc

Browse files
committed
Use map with dimensions in multi poll tooltip
The poll candidates cannot directly override the map name since it is used internally elsewhere (e.g. when looking up minimaps). Instead use a separate displayName property populated on the server with dimensions.
1 parent 50b025a commit dbf69bc

2 files changed

Lines changed: 4 additions & 1 deletion

File tree

LuaMenu/widgets/gui_battle_room_window.lua

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1314,9 +1314,11 @@ local function SetupVotePanel(votePanel, battle, battleID)
13141314
local function SetMultiPollCandidates(candidates)
13151315
for i = 1, MULTI_POLL_MAX do
13161316
if candidates[i] then
1317+
-- displayName is the map's internal name and its dimensions in a human friendly way
1318+
local mapName = candidates[i].displayName or candidates[i].name
13171319
multiPollOpt[i].imMinimap.file, multiPollOpt[i].imMinimap.checkFileExists = config:GetMinimapSmallImage(candidates[i].name)
13181320
multiPollOpt[i].imMinimap:Invalidate()
1319-
multiPollOpt[i].button.tooltip = "Vote for " .. candidates[i].name
1321+
multiPollOpt[i].button.tooltip = "Vote for " .. mapName
13201322
end
13211323
end
13221324
end

libs/liblobby/lobby/interface_zerok.lua

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1291,6 +1291,7 @@ function Interface:_BattlePoll(data)
12911291
}
12921292
if not data.YesNoVote then
12931293
candidates[i].name = opt.Name
1294+
candidates[i].displayName = opt.DisplayName
12941295
end
12951296
end
12961297

0 commit comments

Comments
 (0)