Rename sync functions and drop redundant GetMarkerDef
Rename SetMarkerDef → SetMarkerSync, ClearMarkerDef → ClearMarkerSync to clarify their purpose. Remove GetMarkerDef from the table since GetWorldMarker is now a public global.
This commit is contained in:
+3
-4
@@ -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);
|
||||
|
||||
@@ -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
|
||||
|
||||
|
||||
Reference in New Issue
Block a user