upstream changes (#1453)

- Iterator changes (won't be live until next release)
- Read/WritePlayer [these were not thoroughly tested]
- game.CleanUpMap changes
- replace self.Weapon/self.Entity
- use less bits for radar net message

---------

Co-authored-by: Tim Goll <github@timgoll.de>
Co-authored-by: Histalek <16392835+Histalek@users.noreply.github.com>

Author: 3 people

CHANGELOG.md

@@ -26,6 +26,10 @@ All notable changes to TTT2 will be documented here. Inspired by [keep a changel
 - The binoculars now use the default crosshair as well
 - Tracers are now drawn for every shot/pellet instead of only 25% of shots/pellets
 - The ConVar "ttt_debug_preventwin" will now also prevent the time limit from ending the round (by @NickCloudAT)
+- Micro optimizations
+  - switched from `player.GetAll()` to `select(2, player.Iterator())`
+  - use `net.ReadPlayer` / `net.WritePlayer` if applicable instead of `net.Read|WriteEntity`
+  - Reduced radar bit size for net message
 
 ### Fixed
 

gamemodes/terrortown/entities/entities/ttt_base_placeable.lua

@@ -179,7 +179,7 @@ if SERVER then
             end
 
             local pos = self:GetPos()
-            local ignore = player.GetAll()
+            local ignore = select(2, player.Iterator())
 
             ignore[#ignore + 1] = self
 

gamemodes/terrortown/entities/entities/ttt_c4/shared.lua

@@ -8,6 +8,7 @@ local hook = hook
 local table = table
 local net = net
 local IsValid = IsValid
+local playerIterator = player.Iterator
 
 local defuserNearRadius = 90000
 
@@ -171,11 +172,10 @@ function ENT:SphereDamage(dmgowner, center, radius)
     local d = 0.0
     local diff = nil
     local dmg = 0
-    local plys = player.GetAll()
 
+    local plys = select(2, playerIterator())
     for i = 1, #plys do
         local ply = plys[i]
-
         if ply:Team() ~= TEAM_TERROR then
             continue
         end
@@ -321,11 +321,10 @@ function ENT:IsDefuserInRange()
     local center = self:GetPos()
     local d = 0.0
     local diff = nil
-    local plys = player.GetAll()
 
+    local plys = select(2, playerIterator())
     for i = 1, #plys do
         local ply = plys[i]
-
         if not ply:IsActive() or not ply:GetSubRoleData().isPolicingRole then
             continue
         end

gamemodes/terrortown/entities/entities/ttt_traitor_check.lua

@@ -32,7 +32,7 @@ function ENT:CountValidPlayers(activator, caller, data)
     local mins = self:LocalToWorld(self:OBBMins())
     local maxs = self:LocalToWorld(self:OBBMaxs())
 
-    local plys = player.GetAll()
+    local plys = select(2, player.Iterator())
     local count = 0
 
     for i = 1, #plys do

gamemodes/terrortown/entities/entities/ttt_weapon_check.lua

@@ -109,7 +109,10 @@ function ENT:TestWeapons(weptype)
         return 0
     end
 
-    for _, ply in ipairs(player.GetAll()) do
+    local plys = select(2, player.Iterator())
+
+    for i = 1, #plys do
+        local ply = plys[i]
         if IsValid(ply) and ply:IsTerror() then
             local pos = ply:GetPos()
             local center = ply:LocalToWorld(ply:OBBCenter())

gamemodes/terrortown/entities/weapons/weapon_ttt_phammer.lua

@@ -147,7 +147,7 @@ function SWEP:PrimaryAttack()
         local tr = util.TraceLine({
             start = ply:GetShootPos(),
             endpos = ply:GetShootPos() + ply:GetAimVector() * self.MaxRange,
-            filter = { ply, self.Entity },
+            filter = { ply, self },
             mask = MASK_SOLID,
         })
 
@@ -191,7 +191,7 @@ function SWEP:SecondaryAttack()
         local tr = util.TraceLine({
             start = ply:GetShootPos(),
             endpos = ply:GetShootPos() + ply:GetAimVector() * range,
-            filter = { ply, self.Entity },
+            filter = { ply, self },
             mask = MASK_SOLID,
         })
 

gamemodes/terrortown/entities/weapons/weapon_ttt_teleport.lua

@@ -176,7 +176,7 @@ local function CanTeleportToPos(ply, pos)
         start = pos,
         endpos = pos,
         mask = MASK_PLAYERSOLID,
-        filter = player.GetAll(),
+        filter = select(2, player.Iterator()),
     }
     local collide = false
 

gamemodes/terrortown/entities/weapons/weapon_zm_carry.lua

@@ -273,7 +273,7 @@ function SWEP:CheckValidity()
 end
 
 local function PlayerStandsOn(ent)
-    local plys = player.GetAll()
+    local plys = select(2, player.Iterator())
 
     for i = 1, #plys do
         local ply = plys[i]

gamemodes/terrortown/gamemode/client/cl_chat.lua

@@ -16,7 +16,7 @@ local color_4 = Color(255, 200, 20)
 local color_5 = Color(255, 255, 200)
 
 local function LastWordsRecv()
-    local sender = net.ReadEntity()
+    local sender = net.ReadPlayer()
     local words = net.ReadString()
 
     local validSender = IsValid(sender)
@@ -36,7 +36,7 @@ end
 net.Receive("TTT_LastWordsMsg", LastWordsRecv)
 
 local function TTT_RoleChat()
-    local sender = net.ReadEntity()
+    local sender = net.ReadPlayer()
     if not IsValid(sender) then
         return
     end

gamemodes/terrortown/gamemode/client/cl_main.lua

@@ -9,6 +9,7 @@ local util = util
 local IsValid = IsValid
 local surface = surface
 local hook = hook
+local playerIterator = player.Iterator
 
 -- Define GM12 fonts for compatibility
 surface.CreateFont("DefaultBold", { font = "Tahoma", size = 13, weight = 1000 })
@@ -348,8 +349,7 @@ function GM:InitPostEntity()
     end
 
     -- cache players avatar
-    local plys = player.GetAll()
-
+    local plys = select(2, playerIterator())
     for i = 1, #plys do
         local plyid64 = plys[i]:SteamID64()
 
@@ -452,8 +452,6 @@ function GetRoundState()
 end
 
 local function RoundStateChange(o, n)
-    local plys = player.GetAll()
-
     if n == ROUND_PREP then
         -- prep starts
         GAMEMODE:ClearClientState()
@@ -489,6 +487,7 @@ local function RoundStateChange(o, n)
         CLSCORE:ClearPanel()
 
         -- people may have died and been searched during prep
+        local plys = select(2, playerIterator())
         for i = 1, #plys do
             bodysearch.ResetSearchResult(plys[i])
         end
@@ -529,11 +528,10 @@ local function RoundStateChange(o, n)
     -- whatever round state we get, clear out the voice flags
     local winTeams = roles.GetWinTeams()
 
+    local plys = select(2, playerIterator())
     for i = 1, #plys do
-        local pl = plys[i]
-
         for k = 1, #winTeams do
-            pl[winTeams[k] .. "_gvoice"] = false
+            plys[i][winTeams[k] .. "_gvoice"] = false
         end
     end
 end
@@ -565,8 +563,7 @@ end
 net.Receive("TTT_Role", ReceiveRole)
 
 local function ReceiveRoleReset()
-    local plys = player.GetAll()
-
+    local plys = select(2, playerIterator())
     for i = 1, #plys do
         plys[i]:SetRole(ROLE_NONE, TEAM_NONE)
     end
@@ -651,8 +648,7 @@ function GM:ClearClientState()
 
     VOICE.InitBattery()
 
-    local plys = player.GetAll()
-
+    local plys = select(2, playerIterator())
     for i = 1, #plys do
         local pl = plys[i]
         if not IsValid(pl) then