X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;f=progs.h;h=b1578120abe589656c3eb3c72badcc1fe123847c;hb=435b52972823fa8e8ceb9b67797ca3f886f6208a;hp=e1e365c4166c9b70454375585277777783666e98;hpb=093c41bf532834207d8a23df44f5b39fa707815d;p=xonotic%2Fdarkplaces.git diff --git a/progs.h b/progs.h index e1e365c4..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; @@ -171,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); @@ -182,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)