hard-code NUM_TYPE_SIZES as 8 and move to progs.h.

sezero · Jul 30, 2024 · e648a0d · e648a0d
1 parent f8e8957
commit e648a0d
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 4 deletions.
diff --git a/Quake/pr_edict.c b/Quake/pr_edict.c
@@ -44,7 +44,7 @@ int		pr_edict_size;		// in bytes
 
 unsigned short	pr_crc;
 
-const int	type_size[8] = {
+const int	type_size[NUM_TYPE_SIZES] = {
 	1,					// ev_void
 	1,	// sizeof(string_t) / 4		// ev_string
 	1,					// ev_float
@@ -55,8 +55,6 @@ const int	type_size[8] = {
 	1	// sizeof(void *) / 4		// ev_pointer
 };
 
-#define NUM_TYPE_SIZES (int)Q_COUNTOF(type_size)
-
 static ddef_t	*ED_FieldAtOfs (int ofs);
 static qboolean	ED_ParseEpair (void *base, ddef_t *key, const char *s);
 

diff --git a/Quake/progs.h b/Quake/progs.h
@@ -119,7 +119,8 @@ int NUM_FOR_EDICT(edict_t*);
 #define	E_VECTOR(e,o)		(&((float*)&e->v)[o])
 #define	E_STRING(e,o)		(PR_GetString(*(string_t *)&((float*)&e->v)[o]))
 
-extern const int	type_size[8];
+#define NUM_TYPE_SIZES 8
+extern const int	type_size[NUM_TYPE_SIZES];
 
 typedef void (*builtin_t) (void);
 extern const builtin_t *pr_builtins;