Skip to content

Dont store functiondata permanently #3472

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Astralcircle merged 1 commit into from
Dec 7, 2025
Merged

Dont store functiondata permanently #3472

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion lua/entities/gmod_wire_expression2/core/extloader.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,6 @@ if ENT then
ENT = nil

_Msg( "Calling constructors for all Expression 2 chips." )
wire_expression2_prepare_functiondata()
if not args or args[1] ~= "nosend" then
for _, p in player.Iterator() do
if IsValid( p ) then wire_expression2_sendfunctions( p ) end
Expand Down
16 changes: 7 additions & 9 deletions lua/entities/gmod_wire_expression2/core/init.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -303,12 +303,8 @@ if SERVER then
include("extloader.lua")

-- -- Transfer E2 function info to the client for validation and syntax highlighting purposes -- --

local miscdata = {} -- Will contain {E2 types info, constants}, this whole table is under 1kb
local functiondata = {} -- Will contain {functionname = {returntype, cost, argnames, extension}, this will be between 50-100kb

-- Fills out the above two tables
function wire_expression2_prepare_functiondata()
local function getE2FunctionData()
-- Sanitize events so 'listening' e2's aren't networked
local events_sanitized = {}
for evt, data in pairs(E2Lib.Env.Events) do
Expand All @@ -325,20 +321,22 @@ if SERVER then
types[typename] = v[1] -- typeid (s)
end

miscdata = { types, wire_expression2_constants, events_sanitized }
functiondata = {}
local miscdata = { types, wire_expression2_constants, events_sanitized }
local functiondata = {}

for signature, v in pairs(wire_expression2_funcs) do
functiondata[signature] = { v[2], v[4], v.argnames, v.extension, v.attributes } -- ret (s), cost (n), argnames (t), extension (s), attributes (t)
end
end

wire_expression2_prepare_functiondata()
return miscdata, functiondata
end

-- Send everything
local function sendData(ply)
if not (IsValid(ply) and ply:IsPlayer()) then return end

local miscdata, functiondata = getE2FunctionData()

local data = WireLib.von.serialize( {
miscdata = miscdata,
functiondata = functiondata
Expand Down
Loading