Merge branch 'master' into gravgun

2 years ago · 998118f401
1 changed files with 3 additions and 0 deletions
--- a/engine/sprite.h
+++ b/engine/sprite.h
@ -28,11 +28,14 @@ SPRITE MODELS
				@@ -28,11 +28,14 @@ SPRITE MODELS
 #define IDSPRITEHEADER	(('P'<<24)+('S'<<16)+('D'<<8)+'I')	// little-endian "IDSP"
 #define SPRITE_VERSION	2				// Half-Life sprites

+#if !defined(SYNCTYPE_T)
+#define SYNCTYPE_T
 typedef enum
 {
 	ST_SYNC = 0,
 	ST_RAND
 } synctype_t;
+#endif

 typedef enum
 {