X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;f=progs.h;h=874ba9f93ab0ed89102f198d44ae96d15defe326;hb=dbce962f09403fd5888d0bd858ceefc90bc3ea2b;hp=c1b60e705199b4681510121a4ec6383376d1966c;hpb=c8bb868ff307ff3d8342e9e4adaa4f2615b58616;p=xonotic%2Fdarkplaces.git

diff --git a/progs.h b/progs.h
index c1b60e70..874ba9f9 100644
--- a/progs.h
+++ b/progs.h
@@ -18,6 +18,9 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 */
 
+#ifndef PROGS_H
+#define PROGS_H
+
 #include "pr_comp.h"			// defs shared with qcc
 #include "progdefs.h"			// generated by program cdefs
 
@@ -43,15 +46,16 @@ typedef struct edict_s
 	qboolean	free;
 	link_t		area;
 
+#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
 	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) 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.
 extern int eval_gravity;
@@ -87,6 +91,7 @@ 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)
 
@@ -117,6 +122,8 @@ void PR_LoadProgs (void);
 
 void PR_Profile_f (void);
 
+void PR_Crash (void);
+
 edict_t *ED_Alloc (void);
 void ED_Free (edict_t *ed);
 
@@ -133,23 +140,20 @@ 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) ((edict_t *)(sv.edicts+ (n)*pr_edict_size))
-//define NUM_FOR_EDICT(e) (((byte *)(e) - sv.edicts)/pr_edict_size)
+#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))
 
-//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])
@@ -174,10 +178,10 @@ extern	int			pr_xstatement;
 
 extern	unsigned short		pr_crc;
 
-void PR_RunError (char *error, ...);
+void PR_Execute_ProgsLoaded(void);
 
 void ED_PrintEdicts (void);
 void ED_PrintNum (int ent);
 
-//eval_t *GetEdictFieldValue(edict_t *ed, char *field);
+#endif