Remove shader caching hack. (#12991)

[minetest.git] / src / activeobject.h

diff --git a/src/activeobject.h b/src/activeobject.h
index a319ef904de4ed64037e1440891b5da7622096ec..1d8a3712b6009c4ccf728fcc553188d72809de63 100644 (file)
--- a/src/activeobject.h
+++ b/src/activeobject.h
@@ -27,13 +27,13 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 enum ActiveObjectType {
        ACTIVEOBJECT_TYPE_INVALID = 0,
        ACTIVEOBJECT_TYPE_TEST = 1,
-// Deprecated stuff
-       ACTIVEOBJECT_TYPE_ITEM = 2,
-//     ACTIVEOBJECT_TYPE_RAT = 3,
-//     ACTIVEOBJECT_TYPE_OERKKI1 = 4,
-//     ACTIVEOBJECT_TYPE_FIREFLY = 5,
-       ACTIVEOBJECT_TYPE_MOBV2 = 6,
-// End deprecated stuff
+// Obsolete stuff
+// ACTIVEOBJECT_TYPE_ITEM = 2,
+// ACTIVEOBJECT_TYPE_RAT = 3,
+// ACTIVEOBJECT_TYPE_OERKKI1 = 4,
+// ACTIVEOBJECT_TYPE_FIREFLY = 5,
+// ACTIVEOBJECT_TYPE_MOBV2 = 6,
+// End obsolete stuff
        ACTIVEOBJECT_TYPE_LUAENTITY = 7,
 // Special type, not stored as a static object
        ACTIVEOBJECT_TYPE_PLAYER = 100,
@@ -55,6 +55,23 @@ struct ActiveObjectMessage
        std::string datastring;
 };
 
+enum ActiveObjectCommand {
+       AO_CMD_SET_PROPERTIES,
+       AO_CMD_UPDATE_POSITION,
+       AO_CMD_SET_TEXTURE_MOD,
+       AO_CMD_SET_SPRITE,
+       AO_CMD_PUNCHED,
+       AO_CMD_UPDATE_ARMOR_GROUPS,
+       AO_CMD_SET_ANIMATION,
+       AO_CMD_SET_BONE_POSITION,
+       AO_CMD_ATTACH_TO,
+       AO_CMD_SET_PHYSICS_OVERRIDE,
+       AO_CMD_OBSOLETE1,
+       // ^ UPDATE_NAMETAG_ATTRIBUTES deprecated since 0.4.14, removed in 5.3.0
+       AO_CMD_SPAWN_INFANT,
+       AO_CMD_SET_ANIMATION_SPEED
+};
+
 /*
        Parent class for ServerActiveObject and ClientActiveObject
 */
@@ -103,9 +120,9 @@ class ActiveObject
 
 
        virtual void setAttachment(int parent_id, const std::string &bone, v3f position,
-                       v3f rotation) {}
+                       v3f rotation, bool force_visible) {}
        virtual void getAttachment(int *parent_id, std::string *bone, v3f *position,
-                       v3f *rotation) const {}
+                       v3f *rotation, bool *force_visible) const {}
        virtual void clearChildAttachments() {}
        virtual void clearParentAttachment() {}
        virtual void addAttachmentChild(int child_id) {}