common: Define DP_STATIC_ASSERT which wraps static_assert

[xonotic/darkplaces.git] / model_alias.h

diff --git a/model_alias.h b/model_alias.h
index 61c1099a3a033c8833fd4e39fb6c8e3191bfcb4b..8f153e555fb818866d3c4f18d3823acdd97ea737 100644 (file)
--- a/model_alias.h
+++ b/model_alias.h
@@ -21,6 +21,8 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #ifndef MODEL_ALIAS_H
 #define MODEL_ALIAS_H
 
+#include <stddef.h>
+#include "qtypes.h"
 /*
 ==============================================================================
 
@@ -46,7 +48,7 @@ typedef struct daliashdr_s
        int                     numverts;
        int                     numtris;
        int                     numframes;
-       synctype_t      synctype;
+       int                     synctype;
        int                     flags;
        float           size;
 }
@@ -60,7 +62,7 @@ daliashdr_t;
 ========================================================================
 */
 
-// LordHavoc: grabbed this from the Q2 utility source,
+// LadyHavoc: grabbed this from the Q2 utility source,
 // renamed a things to avoid conflicts
 
 #define MD2ALIAS_VERSION       8
@@ -235,18 +237,19 @@ aliasbone_t;
 // for decoding md3 model latlong vertex normals
 extern float mod_md3_sin[320];
 
-extern cvar_t r_skeletal_debugbone;
-extern cvar_t r_skeletal_debugbonecomponent;
-extern cvar_t r_skeletal_debugbonevalue;
-extern cvar_t r_skeletal_debugtranslatex;
-extern cvar_t r_skeletal_debugtranslatey;
-extern cvar_t r_skeletal_debugtranslatez;
+extern struct cvar_s r_skeletal_debugbone;
+extern struct cvar_s r_skeletal_debugbonecomponent;
+extern struct cvar_s r_skeletal_debugbonevalue;
+extern struct cvar_s r_skeletal_debugtranslatex;
+extern struct cvar_s r_skeletal_debugtranslatey;
+extern struct cvar_s r_skeletal_debugtranslatez;
 
 struct model_s;
 struct frameblend_s;
+struct skeleton_s;
 
 void *Mod_Skeletal_AnimateVertices_AllocBuffers(size_t nbytes);
-void Mod_Skeletal_BuildTransforms(const struct model_s * RESTRICT model, const struct frameblend_s * RESTRICT frameblend, const skeleton_t *skeleton, float * RESTRICT bonepose, float * RESTRICT boneposerelative);
+void Mod_Skeletal_BuildTransforms(const struct model_s * RESTRICT model, const struct frameblend_s * RESTRICT frameblend, const struct skeleton_s *skeleton, float * RESTRICT bonepose, float * RESTRICT boneposerelative);
 
 #endif