From 87d4902f462d87a9fd8bfcdf6d01357dfc07ca65 Mon Sep 17 00:00:00 2001 From: Agent X <44549182+Agent-11@users.noreply.github.com> Date: Mon, 4 Dec 2023 17:23:53 -0500 Subject: [PATCH] Revert "Use metatables to make gGlobalSoundSource readonly" This reverts commit a905f317a7a0c22f002cf41f518d13b7fe0f561d. --- autogen/lua_constants/built-in.lua | 14 +------------- autogen/lua_definitions/constants.lua | 14 +------------- src/pc/lua/smlua_constants_autogen.c | 13 +------------ 3 files changed, 3 insertions(+), 38 deletions(-) diff --git a/autogen/lua_constants/built-in.lua b/autogen/lua_constants/built-in.lua index 00efa5b8..398fb58d 100644 --- a/autogen/lua_constants/built-in.lua +++ b/autogen/lua_constants/built-in.lua @@ -306,20 +306,8 @@ end -- sound -- ----------- -local function read_only(t) - local proxy = {} - local mt = { -- create metatable - __index = t, - __newindex = function() - error('attempt to update a read-only table', 2) - end - } - setmetatable(proxy, mt) - return proxy -end - --- @type Vec3f -gGlobalSoundSource = read_only({ x = 0, y = 0, z = 0 }) +gGlobalSoundSource = { x = 0, y = 0, z = 0 } --- @param bank number --- @param soundID number diff --git a/autogen/lua_definitions/constants.lua b/autogen/lua_definitions/constants.lua index bd8f54ce..489f19ab 100644 --- a/autogen/lua_definitions/constants.lua +++ b/autogen/lua_definitions/constants.lua @@ -308,20 +308,8 @@ end -- sound -- ----------- -local function read_only(t) - local proxy = {} - local mt = { -- create metatable - __index = t, - __newindex = function() - error('attempt to update a read-only table', 2) - end - } - setmetatable(proxy, mt) - return proxy -end - --- @type Vec3f -gGlobalSoundSource = read_only({ x = 0, y = 0, z = 0 }) +gGlobalSoundSource = { x = 0, y = 0, z = 0 } --- @param bank number --- @param soundID number diff --git a/src/pc/lua/smlua_constants_autogen.c b/src/pc/lua/smlua_constants_autogen.c index 3b1dd128..81da2b11 100644 --- a/src/pc/lua/smlua_constants_autogen.c +++ b/src/pc/lua/smlua_constants_autogen.c @@ -272,19 +272,8 @@ char gSmluaConstants[] = "" "-----------\n" "-- sound --\n" "-----------\n" -"local function read_only(t)\n" -" local proxy = {}\n" -" local mt = { -- create metatable\n" -" __index = t,\n" -" __newindex = function()\n" -" error('attempt to update a read-only table', 2)\n" -" end\n" -" }\n" -" setmetatable(proxy, mt)\n" -" return proxy\n" -"end\n" "--- @type Vec3f\n" -"gGlobalSoundSource = read_only({ x = 0, y = 0, z = 0 })\n" +"gGlobalSoundSource = { x = 0, y = 0, z = 0 }\n" "--- @param bank number\n" "--- @param soundID number\n" "--- @param priority number\n"