From 9d51ff1c77ff1116128a57b64579362a17008d3a Mon Sep 17 00:00:00 2001 From: MarcelineVQ Date: Sat, 7 Mar 2026 14:13:41 -0800 Subject: [PATCH] Rename sync functions and drop redundant GetMarkerDef MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Rename SetMarkerDef → SetMarkerSync, ClearMarkerDef → ClearMarkerSync to clarify their purpose. Remove GetMarkerDef from the table since GetWorldMarker is now a public global. --- src/main.zig | 7 +++---- src/markers/addon/WorldMarkers.lua | 10 +++++----- 2 files changed, 8 insertions(+), 9 deletions(-) diff --git a/src/main.zig b/src/main.zig index 59aca01..b0bf3f5 100644 --- a/src/main.zig +++ b/src/main.zig @@ -103,11 +103,10 @@ fn registerLuaFunctions() void { registerFunction("GetWorldMarker", @intFromPtr(&markers.luaGetWorldMarker)); registerFunction("CanSetWorldMarker", @intFromPtr(&markers.luaCanSetMarkers)); - // Internal functions in WorldMarkers table (via luaL_openlib) + // Sync functions in WorldMarkers table (used by addon message handler) const lib = [_]lua.LuaReg{ - .{ .name = "SetMarkerDef", .func = @intFromPtr(&markers.luaSetMarkerDef) }, - .{ .name = "ClearMarkerDef", .func = @intFromPtr(&markers.luaClearMarkerDef) }, - .{ .name = "GetMarkerDef", .func = @intFromPtr(&markers.luaGetMarkerDef) }, + .{ .name = "SetMarkerSync", .func = @intFromPtr(&markers.luaSetMarkerDef) }, + .{ .name = "ClearMarkerSync", .func = @intFromPtr(&markers.luaClearMarkerDef) }, .{ .name = null, .func = 0 }, // sentinel }; lua.openlib(lua.getContext(), "WorldMarkers", &lib, 0); diff --git a/src/markers/addon/WorldMarkers.lua b/src/markers/addon/WorldMarkers.lua index a66a701..9428bfb 100644 --- a/src/markers/addon/WorldMarkers.lua +++ b/src/markers/addon/WorldMarkers.lua @@ -18,7 +18,7 @@ BINDING_HEADER_WORLDMARKERS = "World Markers" -- -- Permission model: ALL permission checks are enforced DLL-side. -- WorldMarker/ClearWorldMarker: DLL checks local player is leader/assist. --- SetMarkerDef/ClearMarkerDef: DLL checks sender name against roster. +-- SetMarkerSync/ClearMarkerSync: DLL checks sender name against roster. -- CanSetWorldMarker(): DLL returns 1 if local player has permission. -- ============================================================================= @@ -236,7 +236,7 @@ local function onAddonMessage(prefix, message, channel, sender) end local idx, x, y, z, areaId = parseMarkerFields(parts) if idx then - WorldMarkers.SetMarkerDef(idx, x, y, z, areaId, sender) + WorldMarkers.SetMarkerSync(idx, x, y, z, areaId, sender) end return end @@ -244,15 +244,15 @@ local function onAddonMessage(prefix, message, channel, sender) if cmd == "P" then local idx, x, y, z, areaId = parseMarkerFields(parts) if idx then - WorldMarkers.SetMarkerDef(idx, x, y, z, areaId, sender) + WorldMarkers.SetMarkerSync(idx, x, y, z, areaId, sender) end elseif cmd == "C" then local idx = tonumber(parts[2]) if idx then - WorldMarkers.ClearMarkerDef(idx, sender) + WorldMarkers.ClearMarkerSync(idx, sender) end elseif cmd == "CA" then - WorldMarkers.ClearMarkerDef(sender) + WorldMarkers.ClearMarkerSync(sender) end end