From 0f94f3c787bcef13b8c95e028f3d66a32ae9d6f7 Mon Sep 17 00:00:00 2001 From: Rade Curic Date: Thu, 15 Jan 2026 19:54:11 +0100 Subject: [PATCH 1/2] Object editing types definitions --- include/Server/Components/Objects/objects.hpp | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/include/Server/Components/Objects/objects.hpp b/include/Server/Components/Objects/objects.hpp index 17bec89..b19f387 100644 --- a/include/Server/Components/Objects/objects.hpp +++ b/include/Server/Components/Objects/objects.hpp @@ -71,6 +71,14 @@ enum PlayerBone PlayerBone_Jaw }; +/// Player object editing type +enum ObjectEditingType +{ + ObjectEditingType_None, + ObjectEditingType_Object, + ObjectEditingType_AttachedObject +}; + /* Interfaces, to be passed around */ /// Trivial object material data @@ -294,6 +302,9 @@ struct IPlayerObjectData : public IExtension, public IPool /// Check if the player is editing an object virtual bool editingObject() const = 0; + /// Get the type of object the player is editing + virtual ObjectEditingType getEditingType() const = 0; + /// Edit an attached object in an attachment slot for the player virtual void editAttachedObject(int index) = 0; }; From a312877f7a618e96104e087d9830ba1ebf1beafd Mon Sep 17 00:00:00 2001 From: Rade Curic Date: Thu, 15 Jan 2026 21:19:10 +0100 Subject: [PATCH 2/2] Preserve vtable layout --- include/Server/Components/Objects/objects.hpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/include/Server/Components/Objects/objects.hpp b/include/Server/Components/Objects/objects.hpp index b19f387..28b67c2 100644 --- a/include/Server/Components/Objects/objects.hpp +++ b/include/Server/Components/Objects/objects.hpp @@ -302,9 +302,9 @@ struct IPlayerObjectData : public IExtension, public IPool /// Check if the player is editing an object virtual bool editingObject() const = 0; - /// Get the type of object the player is editing - virtual ObjectEditingType getEditingType() const = 0; - /// Edit an attached object in an attachment slot for the player virtual void editAttachedObject(int index) = 0; + + /// Get the type of object the player is editing + virtual ObjectEditingType getEditingType() const = 0; };