{
// engine-private fields (stored in dynamically resized array)
//edict_engineprivate_t *e;
- prvm_edict_private_t *e;
+ union
+ {
+ prvm_edict_private_t *e;
+ void *vp;
+ // add other private structs as you desire
+ // new structs have to start with the elements of prvm_edit_private_t
+ // e.g. a new struct has to either look like this:
+ // typedef struct server_edict_private_s {
+ // prvm_edict_private_t base;
+ // vec3_t moved_from;
+ // vec3_t moved_fromangles;
+ // ... } server_edict_private_t;
+ // or:
+ // typedef struct server_edict_private_s {
+ // qboolean free;
+ // float freetime;
+ // vec3_t moved_from;
+ // vec3_t moved_fromangles;
+ // ... } server_edict_private_t;
+ // However, the first one should be preferred.
+ } p;
// QuakeC fields (stored in dynamically resized array)
//entvars_t *v;
void *v;
} prvm_edict_t;
-
+
#define PRVM_GETEDICTFIELDVALUE(ed, fieldoffset) (fieldoffset ? (prvm_eval_t *)((qbyte *)ed->v + fieldoffset) : NULL)
/*// this struct is the basic requirement for a qc prog
#define PRVM_FE_THINK 4
#define PRVM_FE_FRAME 8
*/
-#define PRVM_FE_CLASSNAME 32
-#define PRVM_GE_TIME 16
+#define PRVM_FE_CLASSNAME 8
+#define PRVM_FE_CHAIN 4
#define PRVM_OP_STATE 1
#define PRVM_MAX_STACK_DEPTH 256
ddef_t *fielddefs;
ddef_t *globaldefs;
dstatement_t *statements;
- //prvm_pr_globalvars_t*pr_global_struct;
+ //prvm_pr_globalvars_t*pr_global_struct;
float *globals; // same as pr_global_struct
int edict_size; // in bytes
int edictareasize; // LordHavoc: in bytes (for bound checking)
-
+
+ // all memory allocations related to this vm_prog (code, edicts, strings)
mempool_t *progs_mempool;
- mempool_t *edictstring_mempool;
prvm_builtin_t *builtins;
int numbuiltins;
-
+
int argc;
-
+
int trace;
mfunction_t *xfunction;
int xstatement;
- prvm_stack_t stack[PRVM_MAX_STACK_DEPTH];
+ // stacktrace writes into stack[MAX_STACK_DEPTH]
+ // thus increase the array, so depth wont be overwritten
+ prvm_stack_t stack[PRVM_MAX_STACK_DEPTH+1];
int depth;
-
+
int localstack[PRVM_LOCALSTACK_SIZE];
int localstack_used;
- unsigned short crc;
+ unsigned short crc;
//============================================================================
// until this point everything also exists (with the pr_ prefix) in the old vm
// size of the engine private struct
int edictprivate_size;
- // instead of sv_editcts_mempool
- mempool_t *edicts_mempool;
-
// has to be updated every frame - so the vm time is up-to-date
- double time;
+ // AK changed so time will point to the time field (if there is one) else it points to _time
+ // actually should be double, but qc doesnt support it
+ float *time;
+ float _time;
// name of the prog, e.g. "Server", "Client" or "Menu" (used in for text output)
char *name;
// prvm_builtin_mem_t *mem_list;
// now passes as parameter of PRVM_LoadProgs
-// char **required_func;
+// char **required_func;
// int numrequiredfunc;
//============================================================================
-
+
ddef_t *self; // if self != 0 then there is a global self
-
+
//============================================================================
// function pointers
-
+
void (*begin_increase_edicts)(void); // used by PRVM_MEM_Increase_Edicts
- void (*end_increase_edicts)(void);
-
+ void (*end_increase_edicts)(void);
+
void (*init_edict)(int num); // used by PRVM_ED_ClearEdict
void (*free_edict)(prvm_edict_t *ed); // used by PRVM_ED_Free
//============================================================================
// prvm_cmds part
-extern prvm_builtin_t vm_sv_builtins[];
-extern prvm_builtin_t vm_cl_builtins[];
-extern prvm_builtin_t vm_m_builtins[];
+extern prvm_builtin_t vm_sv_builtins[];
+extern prvm_builtin_t vm_cl_builtins[];
+extern prvm_builtin_t vm_m_builtins[];
extern const int vm_sv_numbuiltins;
extern const int vm_cl_numbuiltins;
extern const int vm_m_numbuiltins;
-extern char * vm_sv_extensions;
-extern char * vm_cl_extensions;
-extern char * vm_m_extensions;
+extern char * vm_sv_extensions;
+extern char * vm_cl_extensions;
+extern char * vm_m_extensions;
-void VM_SV_Cmd_Init(void);
-void VM_SV_Cmd_Reset(void);
+void VM_SV_Cmd_Init(void);
+void VM_SV_Cmd_Reset(void);
-void VM_CL_Cmd_Init(void);
-void VM_CL_Cmd_Reset(void);
+void VM_CL_Cmd_Init(void);
+void VM_CL_Cmd_Reset(void);
-void VM_M_Cmd_Init(void);
+void VM_M_Cmd_Init(void);
void VM_M_Cmd_Reset(void);
void VM_Cmd_Init(void);
void PRVM_Profile_f (void);
+void PRVM_PrintState(void);
void PRVM_CrashAll (void);
void PRVM_Crash (void);
char *PRVM_ED_NewString (const char *string);
// returns a copy of the string allocated from the server's string heap
-void PRVM_ED_Print (prvm_edict_t *ed);
+void PRVM_ED_Print(prvm_edict_t *ed);
void PRVM_ED_Write (qfile_t *f, prvm_edict_t *ed);
const char *PRVM_ED_ParseEdict (const char *data, prvm_edict_t *ent);
#define PRVM_EDICT_NUM(n) (((n) >= 0 && (n) < prog->max_edicts) ? prog->edicts + (n) : PRVM_EDICT_NUM_ERROR(n, __FILE__, __LINE__))
//int NUM_FOR_EDICT_ERROR(edict_t *e);
-#define PRVM_NUM_FOR_EDICT(e) ((prvm_edict_t *)(e) - prog->edicts)
+#define PRVM_NUM_FOR_EDICT(e) ((int)((prvm_edict_t *)(e) - prog->edicts))
//int NUM_FOR_EDICT(edict_t *e);
#define PRVM_NEXT_EDICT(e) ((e) + 1)
// FIXME: make these go away?
#define PRVM_E_FLOAT(e,o) (((float*)e->v)[o])
-//#define PRVM_E_INT(e,o) (((int*)e->v)[o])
+#define PRVM_E_INT(e,o) (((int*)e->v)[o])
//#define PRVM_E_VECTOR(e,o) (&((float*)e->v)[o])
#define PRVM_E_STRING(e,o) (PRVM_GetString(*(string_t *)&((float*)e->v)[o]))
void PRVM_Init_Exec(void);
-void PRVM_ED_PrintEdicts (void);
+void PRVM_ED_PrintEdicts_f (void);
void PRVM_ED_PrintNum (int ent);
#define PRVM_GetString(num) (prog->strings + num)
-#define PRVM_SetString(s) ((int) (s - prog->strings))
+#define PRVM_SetString(s) ((s) != NULL ? (int) (s - prog->strings) : 0)
//============================================================================
// used as replacement for a prog stack
-#if 1
- #define PRVM_Begin
- #define PRVM_End prog = 0;
+//#define PRVM_DEBUGPRSTACK
+
+#ifdef PRVM_DEBUGPRSTACK
+#define PRVM_Begin if(prog != 0) Con_Printf("prog not 0(prog = %i) in file: %s line: %i!\n", PRVM_GetProgNr(), __FILE__, __LINE__)
+#define PRVM_End prog = 0
#else
- #define PRVM_Begin { prvm_prog_t *_oldprog_ = prog
- #define PRVM_End if(_oldprog_ != 0) Con_Print("Stack used !\n"); prog = _oldprog_;}
-#endif
+#define PRVM_Begin
+#define PRVM_End prog = 0
+#endif
+
-#define PRVM_NAME (prog->name ? prog->name : "Unknown prog name")
+//#define PRVM_SAFENAME
+#ifndef PRVM_SAFENAME
+ #define PRVM_NAME (prog->name)
+#else
+ #define PRVM_NAME (prog->name ? prog->name : "Unknown prog name")
+#endif
// helper macro to make function pointer calls easier
#define PRVM_GCALL(func) if(prog->func) prog->func
-/*#define PRVM_ERROR if(!prog->error_cmd) \
- Sys_Error("PRVM: No error_cmd specified !\n"); \
- else \
- prog->error_cmd*/
-
-#define PRVM_ERROR PRVM_GCALL(error_cmd)(),Host_Error
-
-
+#define PRVM_ERROR Host_Error
// other prog handling functions
qboolean PRVM_SetProgFromString(const char *str);
qboolean PRVM_ProgLoaded(int prognr);
int PRVM_GetProgNr(void);
-
+
// TODO: fill in the params
//void PRVM_Create();
projects / xonotic / darkplaces.git / blobdiff