Merge commit '93ca259313e7902e89974877f4110fc818e9208b' into garux-merge

[xonotic/netradiant.git] / libs / picomodel / pm_md2.c

diff --git a/libs/picomodel/pm_md2.c b/libs/picomodel/pm_md2.c
index 28cf384e965c918366e0e749fe0f25d3e97cad66..37b5466c56f712e3c36c39dd6d72aaf4dc10d667 100644 (file)
--- a/libs/picomodel/pm_md2.c
+++ b/libs/picomodel/pm_md2.c
@@ -36,29 +36,21 @@
    Nurail: Used pm_md3.c (Randy Reddig) as a template.
  */
 
-
-/* marker */
-#define PM_MD2_C
-
 /* dependencies */
 #include "picointernal.h"
-
+#include "bytebool.h"
 
 /* md2 model format */
-#define MD2_MAGIC               "IDP2"
-#define MD2_VERSION             8
-
-#define MD2_NUMVERTEXNORMALS    162
-#define MD2_MAX_SKINNAME        64
-#define MD2_MAX_TRIANGLES       4096
-#define MD2_MAX_VERTS           2048
-#define MD2_MAX_FRAMES          512
-#define MD2_MAX_MD2SKINS        32
-#define MD2_MAX_SKINNAME        64
-
-#ifndef byte
-       #define byte unsigned char
-#endif
+const char *MD2_MAGIC             = "IDP2";
+const int MD2_VERSION             = 8;
+
+#define MD2_NUMVERTEXNORMALS 162
+
+const int MD2_MAX_TRIANGLES       = 4096;
+const int MD2_MAX_VERTS           = 2048;
+const int MD2_MAX_FRAMES          = 512;
+const int MD2_MAX_MD2SKINS        = 32;
+const int MD2_MAX_SKINNAME        = 64;
 
 typedef struct index_LUT_s
 {