X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fdarkplaces.git;a=blobdiff_plain;f=progs.h;h=ed09789348b875603afea26860077ed1edbae2b7;hp=79e625647737fecc32a096d74cd31cde96190310;hb=2075ae43356d724bae305ce8fd36ea570718b14a;hpb=fdef1fe36bbe55ad8f07800c057edc769902a2b8 diff --git a/progs.h b/progs.h index 79e62564..ed097893 100644 --- a/progs.h +++ b/progs.h @@ -25,6 +25,46 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #define ENTITYGRIDAREAS 16 #define MAX_ENTITYCLUSTERS 16 +#define GEOMTYPE_NONE -1 +#define GEOMTYPE_SOLID 0 +#define GEOMTYPE_BOX 1 +#define GEOMTYPE_SPHERE 2 +#define GEOMTYPE_CAPSULE 3 +#define GEOMTYPE_TRIMESH 4 +#define GEOMTYPE_CYLINDER 5 +#define GEOMTYPE_CAPSULE_X 6 +#define GEOMTYPE_CAPSULE_Y 7 +#define GEOMTYPE_CAPSULE_Z 8 +#define GEOMTYPE_CYLINDER_X 9 +#define GEOMTYPE_CYLINDER_Y 10 +#define GEOMTYPE_CYLINDER_Z 11 + +#define JOINTTYPE_NONE 0 +#define JOINTTYPE_POINT 1 +#define JOINTTYPE_HINGE 2 +#define JOINTTYPE_SLIDER 3 +#define JOINTTYPE_UNIVERSAL 4 +#define JOINTTYPE_HINGE2 5 +#define JOINTTYPE_FIXED -1 + +#define FORCETYPE_NONE 0 +#define FORCETYPE_FORCE 1 +#define FORCETYPE_FORCEATPOS 2 +#define FORCETYPE_TORQUE 3 + +#define ODEFUNC_ENABLE 1 +#define ODEFUNC_DISABLE 2 +#define ODEFUNC_FORCE 3 +#define ODEFUNC_TORQUE 4 + +typedef struct edict_odefunc_s +{ + int type; + vec3_t v1; + vec3_t v2; + struct edict_odefunc_s *next; +}edict_odefunc_t; + typedef struct edict_engineprivate_s { // true if this edict is unused @@ -32,6 +72,10 @@ typedef struct edict_engineprivate_s // sv.time when the object was freed (to prevent early reuse which could // mess up client interpolation or obscure severe QuakeC bugs) float freetime; + // mark for the leak detector + int mark; + // place in the code where it was allocated (for the leak detector) + const char *allocation_origin; // initially false to prevent projectiles from moving on their first frame // (even if they were spawned by an synchronous client think) qboolean move; @@ -55,200 +99,53 @@ typedef struct edict_engineprivate_s // LordHavoc: gross hack to make floating items still work int suspendedinairflag; - // used by PushMove to keep track of where objects were before they were - // moved, in case they need to be moved back - vec3_t moved_from; - vec3_t moved_fromangles; -} -edict_engineprivate_t; - -#endif - - - - - - -////////////////////////////////// -#if 0 - -#include "pr_comp.h" // defs shared with qcc -#include "progdefs.h" // generated by program cdefs - -typedef union eval_s -{ - string_t string; - float _float; - float vector[3]; - func_t function; - int ivector[3]; - int _int; - int edict; -} prvm_eval_t; - -typedef struct link_s -{ - int entitynumber; - struct link_s *prev, *next; -} link_t; -#define ENTITYGRIDAREAS 16 + // cached position to avoid redundant SV_CheckWaterTransition calls on monsters + qboolean waterposition_forceupdate; // force an update on this entity (set by SV_PushMove code for moving water entities) + vec3_t waterposition_origin; // updates whenever this changes -typedef struct edict_engineprivate_s -{ - // true if this edict is unused - qboolean free; - // sv.time when the object was freed (to prevent early reuse which could - // mess up client interpolation or obscure severe QuakeC bugs) - float freetime; - - // cached cluster links for quick stationary object visibility checking - vec3_t cullmins, cullmaxs; - int pvs_numclusters; - int pvs_clusterlist[MAX_ENTITYCLUSTERS]; - - // physics grid areas this edict is linked into - link_t areagrid[ENTITYGRIDAREAS]; - // since the areagrid can have multiple references to one entity, - // we should avoid extensive checking on entities already encountered - int areagridmarknumber; - - // PROTOCOL_QUAKE, PROTOCOL_QUAKEDP, PROTOCOL_NEHAHRAMOVIE, PROTOCOL_QUAKEWORLD - // baseline values - entity_state_t baseline; - - // LordHavoc: gross hack to make floating items still work - int suspendedinairflag; // used by PushMove to keep track of where objects were before they were // moved, in case they need to be moved back vec3_t moved_from; vec3_t moved_fromangles; -} -edict_engineprivate_t; -// the entire server entity structure -// NOTE: keep this small! priv and v are dynamic but this struct is not! -typedef struct edict_s -{ - // engine-private fields (stored in dynamically resized array) - edict_engineprivate_t *e; - // QuakeC fields (stored in dynamically resized array) - entvars_t *v; + framegroupblend_t framegroupblend[MAX_FRAMEGROUPBLENDS]; + frameblend_t frameblend[MAX_FRAMEBLENDS]; + skeleton_t skeleton; + + // physics parameters + qboolean ode_physics; + void *ode_body; + void *ode_geom; + void *ode_joint; + float *ode_vertex3f; + int *ode_element3i; + int ode_numvertices; + int ode_numtriangles; + edict_odefunc_t *ode_func; + vec3_t ode_mins; + vec3_t ode_maxs; + vec3_t ode_scale; + vec_t ode_mass; + float ode_friction; + vec3_t ode_origin; + vec3_t ode_velocity; + vec3_t ode_angles; + vec3_t ode_avelocity; + qboolean ode_gravity; + int ode_modelindex; + vec_t ode_movelimit; // smallest component of (maxs[]-mins[]) + matrix4x4_t ode_offsetmatrix; + matrix4x4_t ode_offsetimatrix; + int ode_joint_type; + int ode_joint_enemy; + int ode_joint_aiment; + vec3_t ode_joint_origin; // joint anchor + vec3_t ode_joint_angles; // joint axis + vec3_t ode_joint_velocity; // second joint axis + vec3_t ode_joint_movedir; // parameters + void *ode_massbuf; } -prvm_edict_t; - -#define PRVM_EDICTFIELDVALUE(ed, fieldoffset) (fieldoffset ? (prvm_eval_t *)((int *)ed->v + fieldoffset) : NULL) - -//============================================================================ - -extern dprograms_t *progs; -extern mfunction_t *pr_functions; -extern char *pr_strings; -extern int pr_stringssize; -extern ddef_t *pr_globaldefs; -extern ddef_t *pr_fielddefs; -extern dstatement_t *pr_statements; -extern globalvars_t *pr_global_struct; -extern float *pr_globals; // same as pr_global_struct - -extern int prog->edict_size; // in bytes -extern int pr_edictareasize; // LordHavoc: for bounds checking - -extern int pr_maxknownstrings; -extern int pr_numknownstrings; -extern const char **pr_knownstrings; - -//============================================================================ - -void PR_Init (void); -void PR_Shutdown (void); - -void PRVM_ExecuteProgram (func_t fnum, const char *errormessage); -void PR_LoadProgs (const char *progsname); - -#define PR_Alloc(buffersize) _PR_Alloc(buffersize, __FILE__, __LINE__) -#define PR_Free(buffer) _PR_Free(buffer, __FILE__, __LINE__) -#define PR_FreeAll() _PR_FreeAll(__FILE__, __LINE__) -void *_PR_Alloc (size_t buffersize, const char *filename, int fileline); -void _PR_Free (void *buffer, const char *filename, int fileline); -void _PR_FreeAll (const char *filename, int fileline); - -void PR_Profile_f (void); - -void PR_PrintState(void); -void PR_Crash (void); - -void SV_IncreaseEdicts(void); - -prvm_edict_t *ED_Alloc (void); -void ED_Free (prvm_edict_t *ed); -void ED_ClearEdict (prvm_edict_t *e); - -void ED_Print(prvm_edict_t *ed); -void ED_Write (qfile_t *f, prvm_edict_t *ed); -const char *ED_ParseEdict (const char *data, prvm_edict_t *ent); - -void ED_WriteGlobals (qfile_t *f); -void ED_ParseGlobals (const char *data); - -void ED_LoadFromFile (const char *data); - -prvm_edict_t *EDICT_NUM_ERROR(int n, char *filename, int fileline); -#define PRVM_EDICT_NUM(n) (((n) >= 0 && (n) < prog->max_edicts) ? prog->edicts + (n) : EDICT_NUM_ERROR(n, __FILE__, __LINE__)) -#define EDICT_NUM_UNSIGNED(n) (((n) < prog->max_edicts) ? prog->edicts + (n) : EDICT_NUM_ERROR(n, __FILE__, __LINE__)) - -//int NUM_FOR_EDICT_ERROR(prvm_edict_t *e); -#define PRVM_NUM_FOR_EDICT(e) ((int)((prvm_edict_t *)(e) - prog->edicts)) -//int PRVM_NUM_FOR_EDICT(prvm_edict_t *e); - -#define PRVM_NEXT_EDICT(e) ((e) + 1) - -#define PRVM_EDICT_TO_PROG(e) (PRVM_NUM_FOR_EDICT(e)) -//int PRVM_EDICT_TO_PROG(prvm_edict_t *e); -#define PRVM_PROG_TO_EDICT(n) (PRVM_EDICT_NUM(n)) -//prvm_edict_t *PRVM_PROG_TO_EDICT(int n); - -//============================================================================ - -#define PRVM_G_FLOAT(o) (pr_globals[o]) -#define PRVM_G_INT(o) (*(int *)&pr_globals[o]) -#define PRVM_G_EDICT(o) (PRVM_PROG_TO_EDICT(*(int *)&pr_globals[o])) -#define PRVM_G_EDICTNUM(o) PRVM_NUM_FOR_EDICT(PRVM_G_EDICT(o)) -#define PRVM_G_VECTOR(o) (&pr_globals[o]) -#define PRVM_G_STRING(o) (PRVM_GetString(*(string_t *)&pr_globals[o])) -//#define G_FUNCTION(o) (*(func_t *)&pr_globals[o]) - -// FIXME: make these go away? -#define E_FLOAT(e,o) (((float*)e->v)[o]) -//#define E_INT(e,o) (((int*)e->v)[o]) -//#define E_VECTOR(e,o) (&((float*)e->v)[o]) -#define E_STRING(e,o) (PRVM_GetString(*(string_t *)&((float*)e->v)[o])) - -extern int type_size[8]; - -typedef void (*builtin_t) (void); -extern builtin_t *pr_builtins; -extern int pr_numbuiltins; - -extern int pr_argc; - -extern int pr_trace; -extern mfunction_t *pr_xfunction; -extern int pr_xstatement; - -extern unsigned short pr_crc; - -void PR_Execute_ProgsLoaded(void); - -void ED_PrintEdicts (void); -void ED_PrintNum (int ent); - -const char *PRVM_GetString(int num); -int PR_SetQCString(const char *s); -int PRVM_SetEngineString(const char *s); -int PRVM_SetTempString(const char *s); -char *PR_AllocString(int bufferlength); -void PR_FreeString(char *s); +edict_engineprivate_t; #endif -