Use MAX_EDICT_BITS global

Author: wrefgtzweve

lua/entities/gmod_wire_expression2/core/hologram.lua

@@ -239,13 +239,13 @@ local function flush_scale_queue(queue, recipient)
 	net.Start("wire_holograms_set_scale")
 		for _, plyqueue in pairs(queue) do
 			for Holo, scale in pairs(plyqueue) do
-				net.WriteUInt(Holo.ent:EntIndex(), WireLib.MAX_EDICT_BITS)
+				net.WriteUInt(Holo.ent:EntIndex(), MAX_EDICT_BITS)
 				net.WriteFloat(scale.x)
 				net.WriteFloat(scale.y)
 				net.WriteFloat(scale.z)
 			end
 		end
-		net.WriteUInt(0, WireLib.MAX_EDICT_BITS)
+		net.WriteUInt(0, MAX_EDICT_BITS)
 	if recipient then net.Send(recipient) else net.Broadcast() end
 end
 
@@ -257,15 +257,15 @@ local function flush_bone_scale_queue(queue, recipient)
 	for _, plyqueue in pairs(queue) do
 		for Holo, holoqueue in pairs(plyqueue) do
 			for bone, scale in pairs(holoqueue) do
-				net.WriteUInt(Holo.ent:EntIndex(), WireLib.MAX_EDICT_BITS)
+				net.WriteUInt(Holo.ent:EntIndex(), MAX_EDICT_BITS)
 				net.WriteUInt(bone + 1, 9) -- using +1 to be able reset holo bones scale with -1 and not use signed int
 				net.WriteFloat(scale.x)
 				net.WriteFloat(scale.y)
 				net.WriteFloat(scale.z)
 			end
 		end
 	end
-	net.WriteUInt(0, WireLib.MAX_EDICT_BITS)
+	net.WriteUInt(0, MAX_EDICT_BITS)
 	net.WriteUInt(0, 16)
 	if recipient then net.Send(recipient) else net.Broadcast() end
 end
@@ -279,7 +279,7 @@ local function flush_clip_queue(queue, recipient)
 			for Holo,holoqueue in pairs(plyqueue) do
 				for _, clip in pairs(holoqueue) do
 					if clip and clip.index then
-						net.WriteUInt(Holo.ent:EntIndex(), WireLib.MAX_EDICT_BITS)
+						net.WriteUInt(Holo.ent:EntIndex(), MAX_EDICT_BITS)
 						net.WriteUInt(clip.index, 4) -- 4: absolute highest wire_holograms_max_clips is thus 16
 						if clip.enabled ~= nil then
 							net.WriteBool(true)
@@ -288,13 +288,13 @@ local function flush_clip_queue(queue, recipient)
 							net.WriteBool(false)
 							net.WriteVector(clip.origin)
 							net.WriteVector(clip.normal)
-							net.WriteUInt(clip.localentid, WireLib.MAX_EDICT_BITS)
+							net.WriteUInt(clip.localentid, MAX_EDICT_BITS)
 						end
 					end
 				end
 			end
 		end
-		net.WriteUInt(0, WireLib.MAX_EDICT_BITS)
+		net.WriteUInt(0, MAX_EDICT_BITS)
 	if recipient then net.Send(recipient) else net.Broadcast() end
 end
 
@@ -305,10 +305,10 @@ local function flush_vis_queue()
 		if IsValid( ply ) and next(plyqueue) ~= nil then
 			net.Start("wire_holograms_set_visible")
 				for Holo,visible in pairs(plyqueue) do
-					net.WriteUInt(Holo.ent:EntIndex(), WireLib.MAX_EDICT_BITS)
+					net.WriteUInt(Holo.ent:EntIndex(), MAX_EDICT_BITS)
 					net.WriteBit(visible)
 				end
-				net.WriteUInt(0, WireLib.MAX_EDICT_BITS)
+				net.WriteUInt(0, MAX_EDICT_BITS)
 			net.Send(ply)
 		end
 	end
@@ -320,11 +320,11 @@ local function flush_player_color_queue()
 	net.Start("wire_holograms_set_player_color")
 		for _, plyqueue in pairs(player_color_queue) do
 			for Holo,color in pairs(plyqueue) do
-				net.WriteUInt(Holo.ent:EntIndex(), WireLib.MAX_EDICT_BITS)
+				net.WriteUInt(Holo.ent:EntIndex(), MAX_EDICT_BITS)
 				net.WriteVector(color)
 			end
 		end
-		net.WriteUInt(0, WireLib.MAX_EDICT_BITS)
+		net.WriteUInt(0, MAX_EDICT_BITS)
 	net.Broadcast()
 end
 

lua/entities/gmod_wire_hologram.lua

@@ -182,15 +182,15 @@ if CLIENT then
 
 	net.Receive("wire_holograms_clip", function(netlen)
 		while true do
-			local entid = net.ReadUInt(WireLib.MAX_EDICT_BITS)
+			local entid = net.ReadUInt(MAX_EDICT_BITS)
 			if entid == 0 then return end -- stupid hack to not include amount of entities in the message. feel free to rework this.
 
 			local clipid = net.ReadUInt(4)
 
 			if net.ReadBool() then
 				SetClipEnabled(entid, clipid, net.ReadBool())
 			else
-				SetClip(entid, clipid, net.ReadVector(), net.ReadVector(), net.ReadUInt(WireLib.MAX_EDICT_BITS))
+				SetClip(entid, clipid, net.ReadVector(), net.ReadVector(), net.ReadUInt(MAX_EDICT_BITS))
 			end
 
 			local ent = Entity(entid)
@@ -270,21 +270,21 @@ if CLIENT then
 	end
 
 	net.Receive("wire_holograms_set_scale", function(netlen)
-		local index = net.ReadUInt(WireLib.MAX_EDICT_BITS)
+		local index = net.ReadUInt(MAX_EDICT_BITS)
 
 		while index ~= 0 do
 			SetScale(index, Vector(net.ReadFloat(), net.ReadFloat(), net.ReadFloat()))
-			index = net.ReadUInt(WireLib.MAX_EDICT_BITS)
+			index = net.ReadUInt(MAX_EDICT_BITS)
 		end
 	end)
 
 	net.Receive("wire_holograms_set_bone_scale", function(netlen)
-		local index = net.ReadUInt(WireLib.MAX_EDICT_BITS)
+		local index = net.ReadUInt(MAX_EDICT_BITS)
 		local bindex = net.ReadUInt(9) - 1 -- using -1 to get negative -1 for reset
 
 		while index ~= 0 do
 			SetBoneScale(index, bindex, Vector(net.ReadFloat(), net.ReadFloat(), net.ReadFloat()))
-			index = net.ReadUInt(WireLib.MAX_EDICT_BITS)
+			index = net.ReadUInt(MAX_EDICT_BITS)
 			bindex = net.ReadUInt(9) - 1
 		end
 	end)
@@ -301,7 +301,7 @@ if CLIENT then
 	end
 
 	net.Receive("wire_holograms_set_visible", function(netlen)
-		local index = net.ReadUInt(WireLib.MAX_EDICT_BITS)
+		local index = net.ReadUInt(MAX_EDICT_BITS)
 
 		while index ~= 0 do
 
@@ -312,7 +312,7 @@ if CLIENT then
 				vis_buffer[index] = net.ReadBit() == 0
 			end
 
-			index = net.ReadUInt(WireLib.MAX_EDICT_BITS)
+			index = net.ReadUInt(MAX_EDICT_BITS)
 		end
 	end)
 
@@ -336,7 +336,7 @@ if CLIENT then
 	end
 
 	net.Receive("wire_holograms_set_player_color", function(netlen)
-		local index = net.ReadUInt(WireLib.MAX_EDICT_BITS)
+		local index = net.ReadUInt(MAX_EDICT_BITS)
 
 		while index ~= 0 do
 			local ent = Entity(index)
@@ -346,7 +346,7 @@ if CLIENT then
 				player_color_buffer[index] = net.ReadVector()
 			end
 
-			index = net.ReadUInt(WireLib.MAX_EDICT_BITS)
+			index = net.ReadUInt(MAX_EDICT_BITS)
 		end
 	end)
 

lua/wire/wireshared.lua

@@ -16,7 +16,7 @@ local string_sub = string.sub
 local utf8_char = utf8.char
 local hook = hook
 
-WireLib.MAX_EDICT_BITS = MAX_EDICT_BITS or 13
+MAX_EDICT_BITS = MAX_EDICT_BITS or 13 -- Delete once MAX_EDICT_BITS is fully out in base GMod
 
 -- extra table functions