From e478186199b7c87325a0c3185f41a71cadb1bc33 Mon Sep 17 00:00:00 2001 From: cypress Date: Mon, 2 Sep 2024 19:15:55 -0700 Subject: [PATCH] Unify progdefs.h across all sourceports --- source/pr_edict.c | 5 -- source/progdefs.h | 164 +++++++++++++++++++++++----------------------- 2 files changed, 81 insertions(+), 88 deletions(-) diff --git a/source/pr_edict.c b/source/pr_edict.c index 0a8528a..a07fc98 100644 --- a/source/pr_edict.c +++ b/source/pr_edict.c @@ -1041,11 +1041,6 @@ void PR_LoadProgs (void) for (i=0 ; iversion != PROG_VERSION) - Sys_Error ("progs.dat has wrong version number (%i should be %i)", progs->version, PROG_VERSION); - if (progs->crc != PROGHEADER_CRC) - Con_Printf ("WARNING!!! progs.dat system vars have been modified, progdefs.h is out of date. Current one is %i\n", progs->crc); - pr_functions = (dfunction_t *)((byte *)progs + progs->ofs_functions); pr_strings = (char *)progs + progs->ofs_strings; pr_globaldefs = (ddef_t *)((byte *)progs + progs->ofs_globaldefs); diff --git a/source/progdefs.h b/source/progdefs.h index 5b36007..e9fb509 100644 --- a/source/progdefs.h +++ b/source/progdefs.h @@ -1,64 +1,64 @@ - -/* file generated by qcc, do not modify */ +/* TODO: Use FTEQCC to autogenerate this. */ typedef struct -{ int pad[28]; - int self; - int other; - int world; - float time; - float frametime; - float force_retouch; +{ + int pad[28]; + int self; + int other; + int world; + float time; + float frametime; + float force_retouch; string_t mapname; - float deathmatch; - float coop; - float teamplay; - float serverflags; - float rounds; - float rounds_change; - float parm1; - float parm2; - float parm3; - float parm4; - float parm5; - float parm6; - float parm7; - float parm8; - float parm9; - float parm10; - float parm11; - float parm12; - float parm13; - float parm14; - float parm15; - float parm16; - vec3_t v_forward; - vec3_t v_up; - vec3_t v_right; - float trace_allsolid; - float trace_startsolid; - float trace_fraction; - vec3_t trace_endpos; - vec3_t trace_plane_normal; - float trace_plane_dist; - int trace_ent; - float trace_inopen; - float trace_inwater; - int msg_entity; - func_t main; - func_t StartFrame; - func_t EndFrame; - func_t PlayerPreThink; - func_t PlayerPostThink; - func_t ClientKill; - func_t ClientConnect; - func_t PutClientInServer; - func_t ClientDisconnect; - func_t SetNewParms; - func_t SetChangeParms; - func_t ParseClientCommand; - string_t CMD_STRING; - func_t Soft_Restart; + float deathmatch; + float coop; + float teamplay; + float serverflags; + float rounds; + float rounds_change; + float parm1; + float parm2; + float parm3; + float parm4; + float parm5; + float parm6; + float parm7; + float parm8; + float parm9; + float parm10; + float parm11; + float parm12; + float parm13; + float parm14; + float parm15; + float parm16; + vec3_t v_forward; + vec3_t v_up; + vec3_t v_right; + float trace_allsolid; + float trace_startsolid; + float trace_fraction; + vec3_t trace_endpos; + vec3_t trace_plane_normal; + float trace_plane_dist; + int trace_ent; + float trace_inopen; + float trace_inwater; + int msg_entity; + func_t main; + func_t StartFrame; + func_t EndFrame; + func_t PlayerPreThink; + func_t PlayerPostThink; + func_t ClientKill; + func_t ClientConnect; + func_t PutClientInServer; + func_t ClientDisconnect; + func_t SetNewParms; + func_t SetChangeParms; + func_t ParseClientCommand; // special command calls + string_t CMD_STRING; + func_t Soft_Restart; } globalvars_t; typedef struct @@ -79,7 +79,7 @@ typedef struct string_t model; float frame; float skin; - float iframetime; + float iframetime; float effects; vec3_t mins; vec3_t maxs; @@ -91,22 +91,22 @@ typedef struct float nextthink; int groundentity; float health; - float points; - float kills; + float points; + float kills; float weapon; string_t weaponmodel; - string_t weapon2model; + string_t weapon2model; float weaponframe; - float weapon2frame; + float weapon2frame; float currentammo; float currentmag; - float zoom; - float weaponskin; - float weapon2skin; + float zoom; + float weaponskin; + float weapon2skin; float primary_grenades; float secondary_grenades; float grenades; - float perks; + float perks; float takedamage; int chain; float deadflag; @@ -114,12 +114,12 @@ typedef struct float button0; float button1; float button2; - float button3; - float button4; - float button5; - float button6; - float button7; - float button8; + float button3; + float button4; + float button5; + float button6; + float button7; + float button8; float impulse; float fixangle; vec3_t v_angle; @@ -136,14 +136,14 @@ typedef struct float ideal_yaw; float yaw_speed; int aiment; - int head; - int larm; - int rarm; + int head; + int larm; + int rarm; int goalentity; float spawnflags; string_t target; string_t targetname; - float bleed_out; + float bleed_out; float progress_bar; int dmg_inflictor; int owner; @@ -156,15 +156,13 @@ typedef struct string_t noise3; float x2_icon; float insta_icon; - vec3_t ADS_Offset; + vec3_t ADS_Offset; vec3_t Flash_Offset; float Flash_Size; string_t Weapon_Name; string_t Weapon_Name_Touch; - float currentmag2; - float maxspeed; + float currentmag2; + float maxspeed; float facingenemy; float scale; -} entvars_t; - -#define PROGHEADER_CRC 14116 +} entvars_t; \ No newline at end of file