now compiles on x86_64 successfully (still a crash regarding progs strings to fix...

[xonotic/darkplaces.git] / progs.h

diff --git a/progs.h b/progs.h
index b1578120abe589656c3eb3c72badcc1fe123847c..99cf61fcf3addab9bf275cba51710b8f5e1798d0 100644 (file)
--- a/progs.h
+++ b/progs.h
@@ -181,7 +181,7 @@ edict_t *EDICT_NUM_ERROR(int n, char *filename, int fileline);
 #define EDICT_NUM_UNSIGNED(n) (((n) < sv.max_edicts) ? sv.edicts + (n) : EDICT_NUM_ERROR(n, __FILE__, __LINE__))
 
 //int NUM_FOR_EDICT_ERROR(edict_t *e);
-#define NUM_FOR_EDICT(e) ((edict_t *)(e) - sv.edicts)
+#define NUM_FOR_EDICT(e) ((int)((edict_t *)(e) - sv.edicts))
 //int NUM_FOR_EDICT(edict_t *e);
 
 #define        NEXT_EDICT(e) ((e) + 1)
@@ -227,7 +227,7 @@ void ED_PrintEdicts (void);
 void ED_PrintNum (int ent);
 
 #define PR_GetString(num) (pr_strings + num) 
-#define PR_SetString(s)   ((int) (s) ? (s - pr_strings) : 0)
+#define PR_SetString(s)   ((s) != NULL ? (int) (s - pr_strings) : 0)
 
 #endif