Only draw tracers to objects that are not attached (that fixes tracers to armor)

[dragonfireclient.git] / src / activeobject.h

diff --git a/src/activeobject.h b/src/activeobject.h
index 4796e168c42fa680b7c76424f35903f2de2d240b..85e160d100b7ef104dad3e0822ba59e7a2c3e55a 100644 (file)
--- a/src/activeobject.h
+++ b/src/activeobject.h
@@ -17,22 +17,23 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 */
 
-#ifndef ACTIVEOBJECT_HEADER
-#define ACTIVEOBJECT_HEADER
+#pragma once
 
 #include "irr_aabb3d.h"
+#include "irr_v3d.h"
 #include <string>
 
+
 enum ActiveObjectType {
        ACTIVEOBJECT_TYPE_INVALID = 0,
        ACTIVEOBJECT_TYPE_TEST = 1,
-// 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 deprecated stuff
+// End obsolete stuff
        ACTIVEOBJECT_TYPE_LUAENTITY = 7,
 // Special type, not stored as a static object
        ACTIVEOBJECT_TYPE_PLAYER = 100,
@@ -54,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
 */
@@ -99,9 +117,16 @@ class ActiveObject
 
 
        virtual bool collideWithObjects() const = 0;
+
+
+       virtual void setAttachment(int parent_id, const std::string &bone, v3f position,
+                       v3f rotation) {}
+       virtual void getAttachment(int *parent_id, std::string *bone, v3f *position,
+                       v3f *rotation) const {}
+       virtual void clearChildAttachments() {}
+       virtual void clearParentAttachment() {}
+       virtual void addAttachmentChild(int child_id) {}
+       virtual void removeAttachmentChild(int child_id) {}
 protected:
        u16 m_id; // 0 is invalid, "no id"
 };
-
-#endif
-