added protocol.o

[xonotic/darkplaces.git] / model_alias.h

diff --git a/model_alias.h b/model_alias.h
index aafcb33d4578e9e77865ca7a7d9fe8dd7c3a1ee3..4d30cdaee3c9c1e6ef580216731a10f391921127 100644 (file)
--- a/model_alias.h
+++ b/model_alias.h
@@ -61,13 +61,6 @@ typedef struct mtriangle_s {
 } mtriangle_t;
 */
 
-// LordHavoc: new vertex format
-typedef struct {
-       byte v[3]; // location
-       signed char n[3]; // surface normal for lighting *127.0
-} trivert2;
-
-#define        MAX_SKINS       32
 typedef struct {
        int                     ident;
        int                     version;
@@ -86,14 +79,6 @@ typedef struct {
        float           size;
 } daliashdr_t;
 
-typedef struct
-{
-       char name[16]; // LordHavoc: only kept this for reasons of viewthing support
-       unsigned short start;
-       unsigned short length;
-       float rate; // in poses per second
-} maliasframe_t;
-
 typedef struct
 {
        vec3_t          scale;
@@ -102,7 +87,6 @@ typedef struct
        int                     numtris;
        int                     numframes;
        int                     numposes;
-       int                     framedata; // LordHavoc: unsigned short start
        int                     texdata; // LordHavoc: texture coordinate array
        int                     posedata; // LordHavoc: vertex data for all the poses
        int                     tridata; // LordHavoc: vertex indices for the triangles
@@ -129,7 +113,6 @@ typedef struct
 #define        MD2MAX_TRIANGLES        4096
 #define MD2MAX_VERTS           4096
 #define MD2MAX_FRAMES          1024
-#define MD2MAX_SKINS   32
 #define        MD2MAX_SKINNAME 64
 // sanity checking size
 #define MD2MAX_SIZE    (16777216)
@@ -151,16 +134,15 @@ typedef struct
        float           scale[3];       // multiply byte verts by this
        float           translate[3];   // then add this
        char            name[16];       // frame name from grabbing
-       trivertx_t      verts[];        // variable sized
+       trivertx_t      verts[1];       // variable sized
 } md2frame_t;
 
-// LordHavoc: memory representation is different than disk
+// must match md2frame_t, this is just used for sizeof()
 typedef struct
 {
        float           scale[3];       // multiply byte verts by this
        float           translate[3];   // then add this
-       trivert2        verts[];        // variable sized
-} md2memframe_t;
+} md2framesize_t;
 
 
 // the glcmd format:
@@ -214,3 +196,6 @@ typedef struct
 
 #define ALIASTYPE_MDL 1
 #define ALIASTYPE_MD2 2
+#define ALIASTYPE_ZYM 3
+
+#include "model_zymotic.h"
\ No newline at end of file