Remove widgets

GFLClan · Aug 2, 2020 · 946e5e9 · 946e5e9
1 parent 684cd5b
commit 946e5e9
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 98 deletions.
diff --git a/lua/autorun/optimize.lua b/lua/autorun/optimize.lua
diff --git a/lua/gamemode/terrortown/gamemode/scoring_shd.lua b/lua/gamemode/terrortown/gamemode/scoring_shd.lua
@@ -7,7 +7,12 @@ local _IsValid = IsValid
 -- Server and client both need this for scoring event logs
 
 -- 2^16 bytes - 4 (header) - 2 (UInt length in TTT_ReportStream) - 1 (terminanting byte)
-(SERVER and SCORE or CLSCORE).MaxStreamLength = 65529
+if SERVER then
+   SCORE.MaxStreamLength = 65529
+else
+   CLSCORE.MaxStreamLength = 65529
+end
+
 
 function ScoreInit()
    return {

diff --git a/lua/gamemode/terrortown/gamemode/shared.lua b/lua/gamemode/terrortown/gamemode/shared.lua
@@ -184,6 +184,16 @@ if CLIENT then
    _G.ScreenScale = memoize(_ScreenScale)
 end
 
+local _hook_Add = hook.Add
+local _MsgN = MsgN
+local _hook_Remove = hook.Remove
+_hook_Add( "PreGamemodeLoaded", "DeleteWidgets", function()
+   function widgets.PlayerTick()
+   end
+   _hook_Remove( "PlayerTick", "TickWidgets" )
+end )
+
+
 _include("util.lua")
 _include("lang_shd.lua") -- uses some of util
 _include("equip_items_shd.lua")

diff --git a/lua/gamemode/terrortown/gamemode/weaponry.lua b/lua/gamemode/terrortown/gamemode/weaponry.lua
@@ -187,7 +187,7 @@ end
 
 -- Note that this is called both when a player spawns and when a round starts
 function GM:PlayerLoadout( ply )
-   if _IsValid(ply) and (not ply:IsSpec()) then
+   if _IsValid(ply) and (not ply:IsSpec()) and ply:Alive() then
       -- clear out equipment flags
       ply:ResetEquipment()