nzp-team/dquakeplus
0
0
Fork 0
mirror of https://github.com/nzp-team/dquakeplus.git synced 2024-11-25 05:11:03 +00:00
Code Issues Projects Releases Packages Wiki Activity

Unify progdefs.h across all sourceports

Browse source
This commit is contained in:
cypress 2024-09-02 19:15:55 -07:00
parent ce50b0f8e1
commit e478186199
2 changed files with 81 additions and 88 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
source/pr_edict.c
View file

@ -1041,11 +1041,6 @@ void PR_LoadProgs (void)
for (i=0 ; i<sizeof(*progs)/4 ; i++) for (i=0 ; i<sizeof(*progs)/4 ; i++)
((int *)progs)[i] = LittleLong ( ((int *)progs)[i] ); ((int *)progs)[i] = LittleLong ( ((int *)progs)[i] );
if (progs->version != 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_functions = (dfunction_t *)((byte *)progs + progs->ofs_functions);
pr_strings = (char *)progs + progs->ofs_strings; pr_strings = (char *)progs + progs->ofs_strings;
pr_globaldefs = (ddef_t *)((byte *)progs + progs->ofs_globaldefs); pr_globaldefs = (ddef_t *)((byte *)progs + progs->ofs_globaldefs);

164
source/progdefs.h
View file

@ -1,64 +1,64 @@
/* TODO: Use FTEQCC to autogenerate this. */
/* file generated by qcc, do not modify */
typedef struct typedef struct
{ int pad[28]; {
int self; int pad[28];
int other; int self;
int world; int other;
float time; int world;
float frametime; float time;
float force_retouch; float frametime;
float force_retouch;
string_t mapname; string_t mapname;
float deathmatch; float deathmatch;
float coop; float coop;
float teamplay; float teamplay;
float serverflags; float serverflags;
float rounds; float rounds;
float rounds_change; float rounds_change;
float parm1; float parm1;
float parm2; float parm2;
float parm3; float parm3;
float parm4; float parm4;
float parm5; float parm5;
float parm6; float parm6;
float parm7; float parm7;
float parm8; float parm8;
float parm9; float parm9;
float parm10; float parm10;
float parm11; float parm11;
float parm12; float parm12;
float parm13; float parm13;
float parm14; float parm14;
float parm15; float parm15;
float parm16; float parm16;
vec3_t v_forward; vec3_t v_forward;
vec3_t v_up; vec3_t v_up;
vec3_t v_right; vec3_t v_right;
float trace_allsolid; float trace_allsolid;
float trace_startsolid; float trace_startsolid;
float trace_fraction; float trace_fraction;
vec3_t trace_endpos; vec3_t trace_endpos;
vec3_t trace_plane_normal; vec3_t trace_plane_normal;
float trace_plane_dist; float trace_plane_dist;
int trace_ent; int trace_ent;
float trace_inopen; float trace_inopen;
float trace_inwater; float trace_inwater;
int msg_entity; int msg_entity;
func_t main; func_t main;
func_t StartFrame; func_t StartFrame;
func_t EndFrame; func_t EndFrame;
func_t PlayerPreThink; func_t PlayerPreThink;
func_t PlayerPostThink; func_t PlayerPostThink;
func_t ClientKill; func_t ClientKill;
func_t ClientConnect; func_t ClientConnect;
func_t PutClientInServer; func_t PutClientInServer;
func_t ClientDisconnect; func_t ClientDisconnect;
func_t SetNewParms; func_t SetNewParms;
func_t SetChangeParms; func_t SetChangeParms;
func_t ParseClientCommand; func_t ParseClientCommand; // special command calls
string_t CMD_STRING; string_t CMD_STRING;
func_t Soft_Restart; func_t Soft_Restart;
} globalvars_t; } globalvars_t;
typedef struct typedef struct
@ -79,7 +79,7 @@ typedef struct
string_t model; string_t model;
float frame; float frame;
float skin; float skin;
float iframetime; float iframetime;
float effects; float effects;
vec3_t mins; vec3_t mins;
vec3_t maxs; vec3_t maxs;
@ -91,22 +91,22 @@ typedef struct
float nextthink; float nextthink;
int groundentity; int groundentity;
float health; float health;
float points; float points;
float kills; float kills;
float weapon; float weapon;
string_t weaponmodel; string_t weaponmodel;
string_t weapon2model; string_t weapon2model;
float weaponframe; float weaponframe;
float weapon2frame; float weapon2frame;
float currentammo; float currentammo;
float currentmag; float currentmag;
float zoom; float zoom;
float weaponskin; float weaponskin;
float weapon2skin; float weapon2skin;
float primary_grenades; float primary_grenades;
float secondary_grenades; float secondary_grenades;
float grenades; float grenades;
float perks; float perks;
float takedamage; float takedamage;
int chain; int chain;
float deadflag; float deadflag;
@ -114,12 +114,12 @@ typedef struct
float button0; float button0;
float button1; float button1;
float button2; float button2;
float button3; float button3;
float button4; float button4;
float button5; float button5;
float button6; float button6;
float button7; float button7;
float button8; float button8;
float impulse; float impulse;
float fixangle; float fixangle;
vec3_t v_angle; vec3_t v_angle;
@ -136,14 +136,14 @@ typedef struct
float ideal_yaw; float ideal_yaw;
float yaw_speed; float yaw_speed;
int aiment; int aiment;
int head; int head;
int larm; int larm;
int rarm; int rarm;
int goalentity; int goalentity;
float spawnflags; float spawnflags;
string_t target; string_t target;
string_t targetname; string_t targetname;
float bleed_out; float bleed_out;
float progress_bar; float progress_bar;
int dmg_inflictor; int dmg_inflictor;
int owner; int owner;
@ -156,15 +156,13 @@ typedef struct
string_t noise3; string_t noise3;
float x2_icon; float x2_icon;
float insta_icon; float insta_icon;
vec3_t ADS_Offset; vec3_t ADS_Offset;
vec3_t Flash_Offset; vec3_t Flash_Offset;
float Flash_Size; float Flash_Size;
string_t Weapon_Name; string_t Weapon_Name;
string_t Weapon_Name_Touch; string_t Weapon_Name_Touch;
float currentmag2; float currentmag2;
float maxspeed; float maxspeed;
float facingenemy; float facingenemy;
float scale; float scale;
} entvars_t; } entvars_t;
#define PROGHEADER_CRC 14116