- Fixed JPEG support on Mac OS X

[xonotic/darkplaces.git] / progs.h

diff --git a/progs.h b/progs.h
index b1578120abe589656c3eb3c72badcc1fe123847c..cdae2523cc26b9c59913ae88313c9a5777049c9c 100644 (file)
--- a/progs.h
+++ b/progs.h
@@ -89,6 +89,8 @@ extern int eval_button5;
 extern int eval_button6;
 extern int eval_button7;
 extern int eval_button8;
+extern int eval_buttonuse;
+extern int eval_buttonchat;
 extern int eval_glow_size;
 extern int eval_glow_trail;
 extern int eval_glow_color;
@@ -123,6 +125,14 @@ extern int eval_light_lev;
 extern int eval_color;
 extern int eval_style;
 extern int eval_pflags;
+extern int eval_cursor_active;
+extern int eval_cursor_screen;
+extern int eval_cursor_trace_start;
+extern int eval_cursor_trace_endpos;
+extern int eval_cursor_trace_ent;
+extern int eval_colormod;
+extern int eval_playermodel;
+extern int eval_playerskin;
 
 #define GETEDICTFIELDVALUE(ed, fieldoffset) (fieldoffset ? (eval_t *)((qbyte *)ed->v + fieldoffset) : NULL)
 
@@ -151,7 +161,7 @@ extern      int                             pr_edictareasize; // LordHavoc: for bounds checking
 void PR_Init (void);
 
 void PR_ExecuteProgram (func_t fnum, const char *errormessage);
-void PR_LoadProgs (void);
+void PR_LoadProgs (const char *progsname);
 
 void PR_Profile_f (void);
 
@@ -181,7 +191,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 +237,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