X-Git-Url: https://de.git.xonotic.org/?p=xonotic%2Fdarkplaces.git;a=blobdiff_plain;f=progs.h;h=b1578120abe589656c3eb3c72badcc1fe123847c;hp=0ee48852ea793e863b49c298d721cd5b957255d4;hb=dccc25c85d6f500995224e813aee2d40e70f0737;hpb=b3895a134a65c7be9ccfe2db7cf7132d5934f316

diff --git a/progs.h b/progs.h
index 0ee48852..b1578120 100644
--- a/progs.h
+++ b/progs.h
@@ -57,13 +57,9 @@ typedef struct edict_engineprivate_s
 	// we should avoid extensive checking on entities already encountered
 	int areagridmarknumber;
 
-	// old entity protocol, not used
-#ifdef QUAKEENTITIES
+	// PROTOCOL_QUAKE
 	// baseline values
 	entity_state_t baseline;
-	// LordHavoc: previous frame
-	entity_state_t deltabaseline;
-#endif
 
 	// LordHavoc: gross hack to make floating items still work
 	int suspendedinairflag;
@@ -123,6 +119,10 @@ extern int eval_viewzoom;
 extern int eval_clientcolors;
 extern int eval_tag_entity;
 extern int eval_tag_index;
+extern int eval_light_lev;
+extern int eval_color;
+extern int eval_style;
+extern int eval_pflags;
 
 #define GETEDICTFIELDVALUE(ed, fieldoffset) (fieldoffset ? (eval_t *)((qbyte *)ed->v + fieldoffset) : NULL)
 
@@ -155,6 +155,7 @@ void PR_LoadProgs (void);
 
 void PR_Profile_f (void);
 
+void PR_PrintState(void);
 void PR_Crash (void);
 
 void SV_IncreaseEdicts(void);
@@ -166,7 +167,7 @@ void ED_ClearEdict (edict_t *e);
 char	*ED_NewString (const char *string);
 // returns a copy of the string allocated from the server's string heap
 
-void ED_Print (edict_t *ed);
+void ED_Print(edict_t *ed);
 void ED_Write (qfile_t *f, edict_t *ed);
 const char *ED_ParseEdict (const char *data, edict_t *ent);
 
@@ -177,6 +178,7 @@ void ED_LoadFromFile (const char *data);
 
 edict_t *EDICT_NUM_ERROR(int n, char *filename, int fileline);
 #define EDICT_NUM(n) (((n) >= 0 && (n) < sv.max_edicts) ? sv.edicts + (n) : EDICT_NUM_ERROR(n, __FILE__, __LINE__))
+#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)
@@ -224,8 +226,8 @@ void PR_Execute_ProgsLoaded(void);
 void ED_PrintEdicts (void);
 void ED_PrintNum (int ent);
 
-#define PR_GetString(num) (pr_strings + num)
-#define PR_SetString(s) ((int) (s - pr_strings))
+#define PR_GetString(num) (pr_strings + num) 
+#define PR_SetString(s)   ((int) (s) ? (s - pr_strings) : 0)
 
 #endif