Remove useless WireLib.ErrorNoHalt function + remove useless GMOD 13 check

lua/autorun/wire_load.lua

@@ -15,12 +15,6 @@ See the License for the specific language governing permissions and
 limitations under the License.
 ]]--
 
-if VERSION < 140403 and VERSION > 5 then
-	-- VERSION > 5 check added June 2013, to address issues regarding the Steampipe update sometimes setting VERSION to 1.
-	ErrorNoHalt("WireMod: This branch of wiremod only supports Gmod13+.\n")
-	return
-end
-
 if SERVER then
 	-- this file
 	AddCSLuaFile("autorun/wire_load.lua")

lua/entities/gmod_wire_expression2/core/extloader.lua

@@ -114,7 +114,7 @@ local function e2_include_finalize()
 	for _, info in ipairs(included_files) do
 		local ok, message = pcall(e2_include_pass2, unpack(info))
 		if not ok then
-			WireLib.ErrorNoHalt(string.format("There was an error loading " ..
+			ErrorNoHalt(string.format("There was an error loading " ..
 			"the %s extension. Please report this to its developer.\n%s\n",
 			info[1], message))
 		end

lua/entities/gmod_wire_gpu/cl_init.lua

@@ -452,7 +452,7 @@ function ENT:Draw(flags)
 					self:RenderVertex(1024,1024*monitor.RatioX)
 					self:RenderMisc(pos, ang, res, 1/monitor.RatioX, monitor)
 					end, debug.traceback)
-					if not ok then WireLib.ErrorNoHalt(err) end
+					if not ok then ErrorNoHalt(err) end
 				if self.In3D2D then self.In3D2D = false cam.End3D2D() end
 				self.VertexCamSettings = nil
 			end

lua/wire/gpulib.lua

@@ -110,7 +110,7 @@
 
 	end
 
 	-- Frees an used RT
 	local function FreeRT(rt)
 
 		for i, RT in pairs( RenderTargetCache ) do
@@ -125,7 +125,7 @@
 
 	end
 
 	//
 	// Create basic fonts
 	//
 	local fontData =
@@ -150,7 +150,7 @@
   })
 	//
 	// Create screen textures and materials
 	//
 	WireGPU_matScreen = CreateMaterial("sprites/GPURT","UnlitGeneric",{
 		["$vertexcolor"] = 1,
 		["$vertexalpha"] = 1,
@@ -169,7 +169,7 @@
 
 	function GPU:Initialize(no_rendertarget)
 		if no_rendertarget then return nil end
 		-- Rendertarget cache management
 
 		-- This should not even happen.
 		if self.RT then
@@ -299,7 +299,7 @@
 		render.SetViewPort(0, 0, 1024, 1024)
 		cam.Start2D()
 			local ok, err = xpcall(renderfunction, debug.traceback)
-			if not ok then WireLib.ErrorNoHalt(err) end
+			if not ok then ErrorNoHalt(err) end
 		cam.End2D()
 		render.SetViewPort(0, 0, oldw, oldh)
 		render.SetRenderTarget(OldRT)
@@ -326,7 +326,7 @@
 		local res = monitor.RS*1024/h
 		cam.Start3D2D(pos, ang, res)
 			local ok, err = xpcall(renderfunction, debug.traceback, x, y, w, h, monitor, pos, ang, res)
-			if not ok then WireLib.ErrorNoHalt(err) end
+			if not ok then ErrorNoHalt(err) end
 		cam.End3D2D()
 	end
 
@@ -371,7 +371,7 @@
 
 				if postrenderfunction then postrenderfunction(pos, ang, res, aspect, monitor) end
 			end, debug.traceback)
-			if not ok then WireLib.ErrorNoHalt(err) end
+			if not ok then ErrorNoHalt(err) end
 		cam.End3D2D()
 
 		WireGPU_matScreen:SetTexture("$basetexture", OldTex)
@@ -436,7 +436,7 @@
 			{ x+w, y+h },
 		}
 
 		local mins, maxs = screen:OBBMins(), screen:OBBMaxs()
 
 		local timerid = "wire_gpulib_updatebounds"..screen:EntIndex()
 		local function setbounds()
@@ -484,7 +484,7 @@
 
 	function GPULib.switchscreen(screen, ent)
 		screen.GPUEntity = ent
 		umsg.Start("wire_gpulib_setent")
 			umsg.Short(screen:EntIndex())
 			umsg.Short(ent:EntIndex())
 		umsg.End()

lua/wire/timedpairs.lua

@@ -19,7 +19,7 @@
 local next = next
 local pairs = pairs
 local unpack = unpack
 local pcall = pcall
 
 local functions = {}
 function WireLib.TimedpairsGetTable()
@@ -52,7 +52,7 @@
 				local ok, err = xpcall( data.callback, debug.traceback, kv.key, kv.value, unpack(data.args) ) -- DO EET
 
 				if not ok then -- oh noes
-					WireLib.ErrorNoHalt( "Error in Timedpairs '" .. name .. "': " .. err )
+					ErrorNoHalt( "Error in Timedpairs '" .. name .. "': " .. err )
 					toremove[#toremove+1] = name
 					break
 				elseif err == false then -- They returned false inside the function
@@ -65,7 +65,7 @@
 					local ok, err = xpcall( data.endcallback, debug.traceback, kv.key, kv.value, unpack(data.args) )
 
 					if not ok then
-						WireLib.ErrorNoHalt( "Error in Timedpairs '" .. name .. "' (in end function): " .. err )
+						ErrorNoHalt( "Error in Timedpairs '" .. name .. "' (in end function): " .. err )
 					end
 				end
 				toremove[#toremove+1] = name
@@ -74,12 +74,12 @@
 		end
 	end
 
 	for i=1,#toremove do -- Remove all that were flagged for removal
 		functions[toremove[i]] = nil
 	end
 end
 if (CLIENT) then
 	hook.Add("PostRenderVGUI", "WireLib_Timedpairs", Timedpairs) // Doesn't get paused in single player. Can be important for vguis.
 else
 	hook.Add("Think", "WireLib_Timedpairs", Timedpairs) // Servers still uses Think.
 end

lua/wire/wireshared.lua

@@ -407,13 +407,6 @@ WireLib.NetQueue = {
 setmetatable(WireLib.NetQueue, WireLib.NetQueue)
 end
 
-function WireLib.ErrorNoHalt(message)
-	-- ErrorNoHalt clips messages to 512 characters, so chain calls if necessary
-	for i=1,#message, 511 do
-		ErrorNoHalt(message:sub(i,i+510))
-	end
-end
-
 --- Generate a random version 4 UUID and return it as a string.
 function WireLib.GenerateUUID()
 	-- It would be easier to generate this by word rather than by byte, but