From 0bff62e6969b8759d26543cc690894e665ebd781 Mon Sep 17 00:00:00 2001
From: Alibek Omarov <a1ba.omarov@gmail.com>
Date: Tue, 14 Feb 2023 18:29:27 +0300
Subject: [PATCH] engine: sprite: migrate header to stdint.h, remove usage of
 enums in data structs for portability, add static sizeof checks

---
 engine/sprite.h | 72 +++++++++++++++++++++++++++----------------------
 1 file changed, 40 insertions(+), 32 deletions(-)

diff --git a/engine/sprite.h b/engine/sprite.h
index 1ff1d8b5..72cbf2f6 100644
--- a/engine/sprite.h
+++ b/engine/sprite.h
@@ -16,6 +16,10 @@
 #ifndef SPRITE_H
 #define SPRITE_H
 
+#include "build.h"
+#include STDINT_H
+#include "synctype.h"
+
 /*
 ==============================================================================
 
@@ -31,16 +35,6 @@ SPRITE MODELS
 #define SPRITE_VERSION_HL	2				// Half-Life sprites
 #define SPRITE_VERSION_32	32				// Captain Obvious mode on
 
-// must match definition in alias.h
-#ifndef SYNCTYPE_T
-#define SYNCTYPE_T
-typedef enum
-{
-	ST_SYNC = 0,
-	ST_RAND
-} synctype_t;
-#endif
-
 typedef enum
 {
 	FRAME_SINGLE = 0,
@@ -74,55 +68,69 @@ typedef enum
 // generic helper
 typedef struct
 {
-	int		ident;		// LittleLong 'ISPR'
-	int		version;		// current version 2
+	int32_t		ident;		// LittleLong 'ISPR'
+	int32_t		version;		// current version 2
 } dsprite_t;
 
+STATIC_ASSERT( sizeof( dsprite_t ) == 8, "invalid dsprite_t size" );
+
 typedef struct
 {
-	int		ident;		// LittleLong 'ISPR'
-	int		version;		// current version 2
-	int		type;		// camera align
+	int32_t		ident;		// LittleLong 'ISPR'
+	int32_t		version;		// current version 2
+	int32_t		type;		// camera align
 	float		boundingradius;	// quick face culling
-	int		bounds[2];	// mins\maxs
-	int		numframes;	// including groups
+	int32_t		bounds[2];	// mins\maxs
+	int32_t		numframes;	// including groups
 	float		beamlength;	// ???
-	synctype_t	synctype;		// animation synctype
+	uint32_t	synctype;		// animation synctype, was synctype_t
 } dsprite_q1_t;
 
+STATIC_ASSERT( sizeof( dsprite_q1_t ) == 36, "invalid dsprite_q1_t size" );
+
 typedef struct
 {
-	int		ident;		// LittleLong 'ISPR'
-	int		version;		// current version 2
-	angletype_t	type;		// camera align
-	drawtype_t	texFormat;	// rendering mode
-	int		boundingradius;	// quick face culling
-	int		bounds[2];	// mins\maxs
-	int		numframes;	// including groups
-	facetype_t	facetype;		// cullface (Xash3D ext)
-	synctype_t	synctype;		// animation synctype
+	int32_t		ident;		// LittleLong 'ISPR'
+	int32_t		version;		// current version 2
+	uint32_t	type;		// camera align, was angletype_t
+	uint32_t	texFormat;	// rendering mode, was drawtype_t
+	int32_t		boundingradius;	// quick face culling
+	int32_t		bounds[2];	// mins\maxs
+	int32_t		numframes;	// including groups
+	uint32_t	facetype;		// cullface (Xash3D ext), was facetype_t
+	uint32_t	synctype;		// animation synctype, was synctype_t
 } dsprite_hl_t;
 
+STATIC_ASSERT( sizeof( dsprite_hl_t ) == 40, "invalid dsprite_hl_t size" );
+
 typedef struct
 {
-	int		origin[2];
-	int		width;
-	int		height;
+	int32_t		origin[2];
+	int32_t		width;
+	int32_t		height;
 } dspriteframe_t;
 
+STATIC_ASSERT( sizeof( dspriteframe_t ) == 16, "invalid dspriteframe_t size" );
+
 typedef struct
 {
-	int		numframes;
+	int32_t		numframes;
 } dspritegroup_t;
 
+STATIC_ASSERT( sizeof( dspritegroup_t ) == 4, "invalid dspritegroup_t size" );
+
 typedef struct
 {
 	float		interval;
 } dspriteinterval_t;
 
+STATIC_ASSERT( sizeof( dspriteinterval_t ) == 4, "invalid dspriteinterval_t size" );
+
 typedef struct
 {
-	frametype_t	type;
+	uint32_t	type; // was frametype_t
 } dframetype_t;
 
+STATIC_ASSERT( sizeof( dframetype_t ) == 4, "invalid dframetype_t size" );
+
 #endif//SPRITE_H