From 3b24982c0db5aa9020b765ac2e83df775fed0818 Mon Sep 17 00:00:00 2001 From: MihailRis Date: Sat, 13 Jul 2024 01:25:32 +0300 Subject: [PATCH] rename entity:set_rig to entity:set_skeleton --- res/content/base/scripts/components/drop.lua | 4 ++-- res/modules/internal/stdcomp.lua | 2 +- src/logic/scripting/lua/libentity.cpp | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/res/content/base/scripts/components/drop.lua b/res/content/base/scripts/components/drop.lua index 6556fadc..36cb53a8 100644 --- a/res/content/base/scripts/components/drop.lua +++ b/res/content/base/scripts/components/drop.lua @@ -30,7 +30,7 @@ do -- setup visuals local bid = block.index(icon:sub(16)) model = block.get_model(bid) if model == "X" then - entity:set_rig("base:drop-item") + entity:set_skeleton("base:drop-item") body:set_size(vec3.mul(body:get_size(), {1.0, 0.3, 1.0})) rig:set_texture("$0", icon) else @@ -46,7 +46,7 @@ do -- setup visuals end end else - entity:set_rig("base:drop-item") + entity:set_skeleton("base:drop-item") body:set_size(vec3.mul(body:get_size(), {1.0, 0.3, 1.0})) rig:set_texture("$0", icon) end diff --git a/res/modules/internal/stdcomp.lua b/res/modules/internal/stdcomp.lua index 13a901ae..0609cd00 100644 --- a/res/modules/internal/stdcomp.lua +++ b/res/modules/internal/stdcomp.lua @@ -52,7 +52,7 @@ end local Entity = {__index={ despawn=function(self) return entities.despawn(self.eid) end, - set_rig=function(self, s) return entities.set_rig(self.eid, s) end, + set_skeleton=function(self, s) return entities.set_skeleton(self.eid, s) end, get_component=function(self, name) return self.components[name] end, has_component=function(self, name) return self.components[name] ~= nil end, get_uid=function(self) return self.eid end, diff --git a/src/logic/scripting/lua/libentity.cpp b/src/logic/scripting/lua/libentity.cpp index 8c82f83d..0f1db956 100644 --- a/src/logic/scripting/lua/libentity.cpp +++ b/src/logic/scripting/lua/libentity.cpp @@ -32,7 +32,7 @@ static int l_despawn(lua::State* L) { return 0; } -static int l_set_rig(lua::State* L) { +static int l_set_skeleton(lua::State* L) { if (auto entity = get_entity(L, 1)) { std::string skeletonName = lua::require_string(L, 2); auto rigConfig = content->getRig(skeletonName); @@ -48,6 +48,6 @@ const luaL_Reg entitylib [] = { {"exists", lua::wrap}, {"spawn", lua::wrap}, {"despawn", lua::wrap}, - {"set_rig", lua::wrap}, + {"set_skeleton", lua::wrap}, {NULL, NULL} };