X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=progsvm.h;h=6d11e3501c432014ed4a4c4bc23b1f9208e9d434;hb=57eb86d3c5d90014bfe9372edbeb1998b0bef73d;hp=53eb4d3154bd25c483689efacb3ed71624550293;hpb=245cb5ddb59729048e753dc14f55513ca8a53cf1;p=xonotic%2Fdarkplaces.git diff --git a/progsvm.h b/progsvm.h index 53eb4d31..6d11e350 100644 --- a/progsvm.h +++ b/progsvm.h @@ -274,6 +274,12 @@ typedef struct prvm_prog_fieldoffsets_s int userwavefunc_param1; // csqc (userwavefunc) int userwavefunc_param2; // csqc (userwavefunc) int userwavefunc_param3; // csqc (userwavefunc) + + int crypto_keyfp; // svqc (crypto) + int crypto_mykeyfp; // svqc (crypto) + int crypto_idfp; // svqc (crypto) + int crypto_encryptmethod; // svqc (crypto) + int crypto_signmethod; // svqc (crypto) } prvm_prog_fieldoffsets_t; @@ -372,6 +378,7 @@ typedef struct prvm_prog_funcoffsets_s func_t m_keyup; // mqc func_t m_shutdown; // mqc func_t m_toggle; // mqc + func_t m_newmap; // mqc } prvm_prog_funcoffsets_t; @@ -487,12 +494,12 @@ typedef struct prvm_prog_s qboolean allowworldwrites; // name of the prog, e.g. "Server", "Client" or "Menu" (used for text output) - char *name; // [INIT] + const char *name; // [INIT] // flag - used to store general flags like PRVM_GE_SELF, etc. int flag; - char *extensionstring; // [INIT] + const char *extensionstring; // [INIT] qboolean loadintoworld; // [INIT] @@ -557,8 +564,8 @@ extern const int vm_sv_numbuiltins; extern const int vm_cl_numbuiltins; extern const int vm_m_numbuiltins; -extern char * vm_sv_extensions; // client also uses this -extern char * vm_m_extensions; +extern const char * vm_sv_extensions; // client also uses this +extern const char * vm_m_extensions; void VM_SV_Cmd_Init(void); void VM_SV_Cmd_Reset(void); @@ -632,7 +639,7 @@ void PRVM_ED_ParseGlobals (const char *data); void PRVM_ED_LoadFromFile (const char *data); -unsigned int PRVM_EDICT_NUM_ERROR(unsigned int n, char *filename, int fileline); +unsigned int PRVM_EDICT_NUM_ERROR(unsigned int n, const char *filename, int fileline); #define PRVM_EDICT(n) (((unsigned)(n) < (unsigned int)prog->max_edicts) ? (unsigned int)(n) : PRVM_EDICT_NUM_ERROR((unsigned int)(n), __FILE__, __LINE__)) #define PRVM_EDICT_NUM(n) (prog->edicts + PRVM_EDICT(n)) @@ -715,7 +722,7 @@ Load a program with LoadProgs */ void PRVM_InitProg(int prognr); // LoadProgs expects to be called right after InitProg -void PRVM_LoadProgs (const char *filename, int numrequiredfunc, char **required_func, int numrequiredfields, prvm_required_field_t *required_field, int numrequiredglobals, char **required_global); +void PRVM_LoadProgs (const char *filename, int numrequiredfunc, const char **required_func, int numrequiredfields, prvm_required_field_t *required_field, int numrequiredglobals, char **required_global); void PRVM_ResetProg(void); qboolean PRVM_ProgLoaded(int prognr);