Remove modelattach from API, fixes #207

src/engine/interface/ui.cpp

@@ -22,6 +22,7 @@
 
 #include "world/entities.h"
 #include "world/octaedit.h"
+#include "world/octaworld.h"
 #include "world/bih.h"
 
 #include "render/hud.h"

src/engine/model/animmodel.cpp

@@ -30,6 +30,7 @@
 #include "model.h"
 #include "ragdoll.h"
 #include "animmodel.h"
+#include "world/octaworld.h"
 
 //animmodel
 VARP(fullbrightmodels, 0, 0, 200); //sets minimum amount of brightness for a model: 200 is 100% brightness

src/engine/render/rendermodel.h

@@ -1,6 +1,8 @@
 #ifndef RENDERMODEL_H_
 #define RENDERMODEL_H_
 
+#include "world/octaworld.h"
+
 struct mapmodelinfo { string name; model *m, *collide; };
 
 extern std::vector<mapmodelinfo> mapmodels;

src/engine/world/entities.cpp

@@ -15,6 +15,7 @@
 
 #include "model/model.h"
 #include "model/ragdoll.h"
+#include "octaworld.h"
 
 //extentity
 

src/engine/world/octaworld.h

@@ -66,6 +66,22 @@ struct octaentities
     }
 };
 
+
+/**
+ * @brief A representation of a model attachment (e.g. weapon to player).
+ */
+struct modelattach final
+{
+    const char *tag, *name;
+    int anim, basetime;
+    vec *pos;
+    model *m;
+
+    modelattach();
+    modelattach(const char *tag, const char *name, int anim = -1, int basetime = 0);
+    modelattach(const char *tag, vec *pos);
+};
+
 enum
 {
     Occlude_Nothing = 0,