X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fdarkplaces.git;a=blobdiff_plain;f=progs.h;h=c4bd745a45da36e88914ccdfc31465e563e6b428;hp=bd8eada0445a1e8d78fb4894662fcfebeb0e4914;hb=e4a64f985033d6c22d13c74b9b23a08204417352;hpb=06d8455f84631224fb6bb29ab1bd56e3f849a086 diff --git a/progs.h b/progs.h index bd8eada0..c4bd745a 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,113 @@ 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 + +typedef struct link_s +{ + int entitynumber; + struct link_s *prev, *next; +} link_t; + +#define ENTITYGRIDAREAS 16 + +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, PROTOCOL_QUAKEDP, PROTOCOL_NEHAHRAMOVIE + // 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; + +// LordHavoc: in an effort to eliminate time wasted on GetEdictFieldValue... see pr_edict.c for the functions which use these. +extern int eval_gravity; +extern int eval_button3; +extern int eval_button4; +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; +extern int eval_items2; +extern int eval_scale; +extern int eval_alpha; +extern int eval_renderamt; // HalfLife support +extern int eval_rendermode; // HalfLife support +extern int eval_fullbright; +extern int eval_ammo_shells1; +extern int eval_ammo_nails1; +extern int eval_ammo_lava_nails; +extern int eval_ammo_rockets1; +extern int eval_ammo_multi_rockets; +extern int eval_ammo_cells1; +extern int eval_ammo_plasma; +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_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; + +extern mfunction_t *SV_PlayerPhysicsQC; +extern mfunction_t *EndFrameQC; +//KrimZon - SERVER COMMANDS IN QUAKEC +extern mfunction_t *SV_ParseClientCommandQC; + +#endif + + + + + + +////////////////////////////////// +#if 0 + #include "pr_comp.h" // defs shared with qcc #include "progdefs.h" // generated by program cdefs @@ -27,34 +134,56 @@ typedef union eval_s float _float; float vector[3]; func_t function; + int ivector[3]; int _int; int edict; -} eval_t; +} prvm_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 256 -#define MAX_ENT_LEAFS 256 +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, PROTOCOL_QUAKEDP, PROTOCOL_NEHAHRAMOVIE + // 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; - 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; +} +prvm_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; @@ -64,6 +193,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; @@ -86,79 +217,119 @@ 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 PRVM_GETEDICTFIELDVALUE(ed, fieldoffset) (fieldoffset ? (prvm_eval_t *)((qbyte *)ed->v + fieldoffset) : NULL) -#define GETEDICTFIELDVALUE(ed, fieldoffset) (fieldoffset ? (eval_t*)((char*)&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 *prog->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 pr_edict_size; // in bytes +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 PR_ExecuteProgram (func_t fnum, char *errormessage); -void PR_LoadProgs (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); -edict_t *ED_Alloc (void); -void ED_Free (edict_t *ed); +void PR_PrintState(void); +void PR_Crash (void); + +void SV_IncreaseEdicts(void); -char *ED_NewString (char *string); -// returns a copy of the string allocated from the server's string heap +prvm_edict_t *ED_Alloc (void); +void ED_Free (prvm_edict_t *ed); +void ED_ClearEdict (prvm_edict_t *e); -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(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 (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) +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__)) -//edict_t *EDICT_NUM(int n); -int NUM_FOR_EDICT(edict_t *e); +//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 NEXT_EDICT(e) ((edict_t *)( (byte *)e + pr_edict_size)) +#define PRVM_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 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 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_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 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]) -#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) (PRVM_GetString(*(string_t *)&((float*)e->v)[o])) extern int type_size[8]; @@ -168,16 +339,22 @@ 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); +const char *PRVM_GetString(int num); +int PR_SetQCString(const char *s); +int PRVM_SetEngineString(const char *s); +char *PR_AllocString(int bufferlength); +void PR_FreeString(char *s); + +#endif