From 04b6565ff4d262433697aafb22979381e7de8b92 Mon Sep 17 00:00:00 2001 From: Michael Hawkins Date: Sat, 24 Oct 2020 18:37:37 +0100 Subject: [PATCH] Allows players to re-open the mapvote UI --- lua/mapvote/cl_mapvote.lua | 18 ++++++++++++++++-- lua/mapvote/sv_mapvote.lua | 10 ++++++++++ 2 files changed, 26 insertions(+), 2 deletions(-) diff --git a/lua/mapvote/cl_mapvote.lua b/lua/mapvote/cl_mapvote.lua index 357749f..0eba896 100644 --- a/lua/mapvote/cl_mapvote.lua +++ b/lua/mapvote/cl_mapvote.lua @@ -108,7 +108,7 @@ function PANEL:Init() end self.closeButton.DoClick = function() - print("HI") + chat.AddText("To re-open the map vote, type !openmapvote") self:SetVisible(false) end @@ -310,8 +310,12 @@ function PANEL:Paint() surface.DrawRect(0, 0, ScrW(), ScrH()) end -function PANEL:Flash(id) +function PANEL:Show() self:SetVisible(true) +end + +function PANEL:Flash(id) + self:Show() local bar = self:GetMapButton(id) @@ -326,3 +330,13 @@ function PANEL:Flash(id) end derma.DefineControl("RAM_VoteScreen", "", PANEL, "DPanel") + + +net.Receive("RAM_MapVoteOpenUI", function() + if(IsValid(MapVote.Panel) == false) then + chat.AddText("You can only use this command when a mapvote in progress.") + return + end + + MapVote.Panel:Show() +end) diff --git a/lua/mapvote/sv_mapvote.lua b/lua/mapvote/sv_mapvote.lua index f5e17ce..677d649 100644 --- a/lua/mapvote/sv_mapvote.lua +++ b/lua/mapvote/sv_mapvote.lua @@ -1,6 +1,7 @@ util.AddNetworkString("RAM_MapVoteStart") util.AddNetworkString("RAM_MapVoteUpdate") util.AddNetworkString("RAM_MapVoteCancel") +util.AddNetworkString("RAM_MapVoteOpenUI") util.AddNetworkString("RTV_Delay") MapVote.Continued = false @@ -210,3 +211,12 @@ function MapVote.Cancel() timer.Destroy("RAM_MapVote") end end + + +hook.Remove("PlayerSay", "mapvote_playersay") +hook.Add("PlayerSay", "mapvote_playersay", function(ply, text) + if(string.lower(text) != "!openmapvote") then return end + + net.Start("RAM_MapVoteOpenUI") + net.Send(ply) +end)