X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;f=model_alias.h;h=e45abc344b2c58f0332696f770af9a9cd3f74cfd;hb=1612d8feb6a6f36e8502ef61ab0cc51168d44b65;hp=935bd5467697dbe5d9fef4ba5fc5a050ab61d21c;hpb=d57be67cb00229acb8564b92c8b7c58eeed8a0cb;p=xonotic%2Fdarkplaces.git

diff --git a/model_alias.h b/model_alias.h
index 935bd546..e45abc34 100644
--- a/model_alias.h
+++ b/model_alias.h
@@ -18,6 +18,9 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 */
 
+#ifndef MODEL_ALIAS_H
+#define MODEL_ALIAS_H
+
 /*
 ==============================================================================
 
@@ -29,38 +32,6 @@ Alias models are position independent, so the cache manager can move them.
 
 #include "modelgen.h"
 
-/*
-typedef struct
-{
-	int					firstpose;
-	int					numposes;
-	float				interval;
-	trivertx_t			bboxmin;
-	trivertx_t			bboxmax;
-	int					frame;
-	char				name[16];
-} maliasframedesc_t;
-
-typedef struct
-{
-	trivertx_t			bboxmin;
-	trivertx_t			bboxmax;
-	int					frame;
-} maliasgroupframedesc_t;
-
-typedef struct
-{
-	int						numframes;
-	int						intervals;
-	maliasgroupframedesc_t	frames[1];
-} maliasgroup_t;
-
-typedef struct mtriangle_s {
-	int					facesfront;
-	int					vertindex[3];
-} mtriangle_t;
-*/
-
 typedef struct {
 	int			ident;
 	int			version;
@@ -155,9 +126,9 @@ typedef struct
 	int			ofs_end;		// end of file
 } md2_t;
 
-#define ALIASTYPE_MDL 1
-#define ALIASTYPE_MD2 2
-#define ALIASTYPE_ZYM 3
+// LordHavoc: Q1 and Q2 models are converted to the same internal format
+#define ALIASTYPE_MDLMD2 1
+#define ALIASTYPE_ZYM 2
 
 extern void Mod_LoadAliasModel (struct model_s *mod, void *buffer);
 extern void Mod_LoadQ2AliasModel (struct model_s *mod, void *buffer);
@@ -165,3 +136,6 @@ extern void Mod_LoadQ2AliasModel (struct model_s *mod, void *buffer);
 extern void Mod_AliasInit(void);
 
 #include "model_zymotic.h"
+
+#endif
+