optimized (now does not use a sqrt for each entity) and improved findradius (now...

[xonotic/darkplaces.git] / progs.h

diff --git a/progs.h b/progs.h
index 699d84b7f2322ac9ace7cb9178ce0ac169f749dc..166d2eabf3c68a86654ec5f1058d952200402851 100644 (file)
--- a/progs.h
+++ b/progs.h
@@ -43,23 +43,17 @@ typedef struct edict_s
        qboolean        free;
        link_t          area;
 
-       int                     num_leafs;
-       short           leafnums[MAX_ENT_LEAFS];
-
+#ifdef QUAKEENTITIES
        entity_state_t  baseline;
        entity_state_t  deltabaseline; // LordHavoc: previous frame
+#endif
 
+       int                     suspendedinairflag;     // LordHavoc: gross hack to make floating items still work
        float           freetime;                       // sv.time when the object was freed
-       // LordHavoc: for MOVETYPE_STEP interpolation
-       vec3_t          steporigin;
-       vec3_t          stepangles;
-       vec3_t          stepoldorigin;
-       vec3_t          stepoldangles;
-       float           steplerptime;
        entvars_t       v;                                      // C exported fields from progs
 // other fields from progs come immediately after
 } edict_t;
-//#define      EDICT_FROM_AREA(l) ((edict_t *)((byte *)l - (int)&(((edict_t *)0)->area)))
+//#define      EDICT_FROM_AREA(l) ((edict_t *)((qbyte *)l - (int)&(((edict_t *)0)->area)))
 //#define      EDICT_FROM_AREA(l) STRUCT_FROM_LINK(l,edict_t,area)
 
 // LordHavoc: in an effort to eliminate time wasted on GetEdictFieldValue...  see pr_edict.c for the functions which use these.
@@ -92,11 +86,11 @@ extern int eval_viewmodelforclient;
 extern int eval_nodrawtoclient;
 extern int eval_exteriormodeltoclient;
 extern int eval_drawonlytoclient;
-extern int eval_colormod;
 extern int eval_ping;
 extern int eval_movement;
 extern int eval_pmodel;
 extern int eval_punchvector;
+extern int eval_viewzoom;
 
 #define GETEDICTFIELDVALUE(ed, fieldoffset) (fieldoffset ? (eval_t*)((char*)&ed->v + fieldoffset) : NULL)
 
@@ -143,23 +137,23 @@ void ED_ParseGlobals (char *data);
 void ED_LoadFromFile (char *data);
 
 edict_t *EDICT_NUM_ERROR(int n);
-#define EDICT_NUM(n) (n >= 0 ? (n < sv.max_edicts ? (edict_t *)((byte *)sv.edicts + (n) * pr_edict_size) : EDICT_NUM_ERROR(n)) : EDICT_NUM_ERROR(n))
+#define EDICT_NUM(n) (n >= 0 ? (n < sv.max_edicts ? (edict_t *)((qbyte *)sv.edicts + (n) * pr_edict_size) : EDICT_NUM_ERROR(n)) : EDICT_NUM_ERROR(n))
 //define EDICT_NUM(n) ((edict_t *)(sv.edicts+ (n)*pr_edict_size))
-//define NUM_FOR_EDICT(e) (((byte *)(e) - sv.edicts)/pr_edict_size)
+//define NUM_FOR_EDICT(e) (((qbyte *)(e) - sv.edicts)/pr_edict_size)
 
 //edict_t *EDICT_NUM(int n);
 int NUM_FOR_EDICT(edict_t *e);
 
-#define        NEXT_EDICT(e) ((edict_t *)( (byte *)e + pr_edict_size))
+#define        NEXT_EDICT(e) ((edict_t *)( (qbyte *)e + pr_edict_size))
 
-#define        EDICT_TO_PROG(e) ((byte *)e - (byte *)sv.edicts)
-#define PROG_TO_EDICT(e) ((edict_t *)((byte *)sv.edicts + e))
+#define        EDICT_TO_PROG(e) ((qbyte *)e - (qbyte *)sv.edicts)
+#define PROG_TO_EDICT(e) ((edict_t *)((qbyte *)sv.edicts + e))
 
 //============================================================================
 
 #define        G_FLOAT(o) (pr_globals[o])
 #define        G_INT(o) (*(int *)&pr_globals[o])
-#define        G_EDICT(o) ((edict_t *)((byte *)sv.edicts+ *(int *)&pr_globals[o]))
+#define        G_EDICT(o) ((edict_t *)((qbyte *)sv.edicts+ *(int *)&pr_globals[o]))
 #define G_EDICTNUM(o) NUM_FOR_EDICT(G_EDICT(o))
 #define        G_VECTOR(o) (&pr_globals[o])
 #define        G_STRING(o) (pr_strings + *(string_t *)&pr_globals[o])