OGG_FreeSfx and WAV_FreeSfx no longer reference sfx_t

[xonotic/darkplaces.git] / progs.h

diff --git a/progs.h b/progs.h
index 1ef4f55d118645864a1defd7d83b71d1193423ee..1c0fee0cf69196b9429bc60332e4d49d7b23b9d1 100644 (file)
--- a/progs.h
+++ b/progs.h
@@ -137,7 +137,7 @@ typedef struct edict_s
 }
 prvm_edict_t;
 
-#define PRVM_GETEDICTFIELDVALUE(ed, fieldoffset) (fieldoffset ? (prvm_eval_t *)((unsigned char *)ed->v + fieldoffset) : NULL)
+#define PRVM_EDICTFIELDVALUE(ed, fieldoffset) (fieldoffset ? (prvm_eval_t *)((int *)ed->v + fieldoffset) : NULL)
 
 //============================================================================
 
@@ -178,8 +178,6 @@ void PR_Profile_f (void);
 void PR_PrintState(void);
 void PR_Crash (void);
 
-void SV_IncreaseEdicts(void);
-
 prvm_edict_t *ED_Alloc (void);
 void ED_Free (prvm_edict_t *ed);
 void ED_ClearEdict (prvm_edict_t *e);
@@ -194,8 +192,7 @@ void ED_ParseGlobals (const char *data);
 void ED_LoadFromFile (const char *data);
 
 prvm_edict_t *EDICT_NUM_ERROR(int n, char *filename, int fileline);
-#define PRVM_EDICT_NUM(n) (((n) >= 0 && (n) < prog->max_edicts) ? prog->edicts + (n) : EDICT_NUM_ERROR(n, __FILE__, __LINE__))
-#define EDICT_NUM_UNSIGNED(n) (((n) < prog->max_edicts) ? prog->edicts + (n) : EDICT_NUM_ERROR(n, __FILE__, __LINE__))
+#define PRVM_EDICT_NUM(n) (((unsigned int)(n) < (unsigned int)prog->max_edicts) ? prog->edicts + (n) : EDICT_NUM_ERROR(n, __FILE__, __LINE__))
 
 //int NUM_FOR_EDICT_ERROR(prvm_edict_t *e);
 #define PRVM_NUM_FOR_EDICT(e) ((int)((prvm_edict_t *)(e) - prog->edicts))