X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fdarkplaces.git;a=blobdiff_plain;f=progs.h;h=b39f355ef1f0a26a28e1978e67aaaf2da0e810bf;hp=f33e95503187218dc066fcd7ba71651c945fcc39;hb=b4f6284099815f5390c9f00452d15c309f080626;hpb=b9c0ea4ce76e89a5c8858a63a5a6a10d6fd3abea diff --git a/progs.h b/progs.h index f33e9550..b39f355e 100644 --- a/progs.h +++ b/progs.h @@ -8,7 +8,7 @@ of the License, or (at your option) any later version. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. @@ -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 @@ -27,36 +30,56 @@ typedef union eval_s float _float; float vector[3]; func_t function; + int ivector[3]; int _int; int edict; -} eval_t; +} eval_t; + +typedef struct link_s +{ + int entitynumber; + struct link_s *prev, *next; +} link_t; + +#define ENTITYGRIDAREAS 16 -// LordHavoc: increased number of leafs per entity limit from 16 to 64 -#define MAX_ENT_LEAFS 64 +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; + + // 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 + // 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 { - qboolean free; - link_t area; // linked to a division node or leaf - - int num_leafs; - short leafnums[MAX_ENT_LEAFS]; - - entity_state_t baseline; - entity_state_t deltabaseline; // LordHavoc: previous frame - - 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; - // LordHavoc: delta compression - float nextfullupdate; // every second a full update is forced - entvars_t v; // C exported fields from progs -// other fields from progs come immediately after -} edict_t; -#define EDICT_FROM_AREA(l) STRUCT_FROM_LINK(l,edict_t,area) + // engine-private fields (stored in dynamically resized array) + edict_engineprivate_t *e; + // QuakeC fields (stored in dynamically resized array) + entvars_t *v; +} +edict_t; // LordHavoc: in an effort to eliminate time wasted on GetEdictFieldValue... see pr_edict.c for the functions which use these. extern int eval_gravity; @@ -66,6 +89,8 @@ extern int eval_button5; extern int eval_button6; extern int eval_button7; extern int eval_button8; +extern int eval_buttonuse; +extern int eval_buttonchat; extern int eval_glow_size; extern int eval_glow_trail; extern int eval_glow_color; @@ -73,7 +98,7 @@ extern int eval_items2; extern int eval_scale; extern int eval_alpha; extern int eval_renderamt; // HalfLife support -extern int eval_rendertype; // HalfLife support +extern int eval_rendermode; // HalfLife support extern int eval_fullbright; extern int eval_ammo_shells1; extern int eval_ammo_nails1; @@ -86,18 +111,41 @@ extern int eval_idealpitch; extern int eval_pitch_speed; 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; +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; +extern int eval_cursor_active; +extern int eval_cursor_screen; +extern int eval_cursor_trace_start; +extern int eval_cursor_trace_endpos; +extern int eval_cursor_trace_ent; +extern int eval_colormod; +extern int eval_playermodel; +extern int eval_playerskin; -#define GETEDICTFIELDVALUE(ed, fieldoffset) (fieldoffset ? (eval_t*)((char*)&ed->v + fieldoffset) : NULL) +#define GETEDICTFIELDVALUE(ed, fieldoffset) (fieldoffset ? (eval_t *)((qbyte *)ed->v + fieldoffset) : NULL) + + +extern mfunction_t *SV_PlayerPhysicsQC; +extern mfunction_t *EndFrameQC; +//KrimZon - SERVER COMMANDS IN QUAKEC +extern mfunction_t *SV_ParseClientCommandQC; //============================================================================ extern dprograms_t *progs; -extern dfunction_t *pr_functions; +extern mfunction_t *pr_functions; extern char *pr_strings; extern ddef_t *pr_globaldefs; extern ddef_t *pr_fielddefs; @@ -111,54 +159,71 @@ extern int pr_edictareasize; // LordHavoc: for bounds checking //============================================================================ void PR_Init (void); +void PR_Shutdown (void); + +void PR_ExecuteProgram (func_t fnum, const char *errormessage); +void PR_LoadProgs (const char *progsname); -void PR_ExecuteProgram (func_t fnum); -void PR_LoadProgs (void); +#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); + edict_t *ED_Alloc (void); void ED_Free (edict_t *ed); +void ED_ClearEdict (edict_t *e); -char *ED_NewString (char *string); +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_Write (FILE *f, edict_t *ed); -char *ED_ParseEdict (char *data, edict_t *ent); +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); -void ED_WriteGlobals (FILE *f); -void ED_ParseGlobals (char *data); +void ED_WriteGlobals (qfile_t *f); +void ED_ParseGlobals (const char *data); -void ED_LoadFromFile (char *data); +void ED_LoadFromFile (const 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) +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__)) -//edict_t *EDICT_NUM(int n); -int NUM_FOR_EDICT(edict_t *e); +//int NUM_FOR_EDICT_ERROR(edict_t *e); +#define NUM_FOR_EDICT(e) ((int)((edict_t *)(e) - sv.edicts)) +//int NUM_FOR_EDICT(edict_t *e); -#define NEXT_EDICT(e) ((edict_t *)( (byte *)e + pr_edict_size)) +#define NEXT_EDICT(e) ((e) + 1) -#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) (NUM_FOR_EDICT(e)) +//int EDICT_TO_PROG(edict_t *e); +#define PROG_TO_EDICT(n) (EDICT_NUM(n)) +//edict_t *PROG_TO_EDICT(int n); //============================================================================ #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) (PROG_TO_EDICT(*(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]) -#define G_FUNCTION(o) (*(func_t *)&pr_globals[o]) +#define G_STRING(o) (PR_GetString(*(string_t *)&pr_globals[o])) +//#define G_FUNCTION(o) (*(func_t *)&pr_globals[o]) -#define E_FLOAT(e,o) (((float*)&e->v)[o]) -#define E_INT(e,o) (*(int *)&((float*)&e->v)[o]) -#define E_VECTOR(e,o) (&((float*)&e->v)[o]) -#define E_STRING(e,o) (pr_strings + *(string_t *)&((float*)&e->v)[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) (PR_GetString(*(string_t *)&((float*)e->v)[o])) extern int type_size[8]; @@ -168,16 +233,19 @@ extern int pr_numbuiltins; extern int pr_argc; -extern qboolean pr_trace; -extern dfunction_t *pr_xfunction; +extern int pr_trace; +extern mfunction_t *pr_xfunction; 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); +#define PR_GetString(num) (pr_strings + num) +#define PR_SetString(s) ((s) != NULL ? (int) (s - pr_strings) : 0) + +#endif