qf
/
quakeforge
mirror of https://git.code.sf.net/p/quake/quakeforge
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

progdefs? where we're going we dont need... progdefs

This commit is contained in:
Bill Currie 2001-08-27 21:09:13 +00:00
parent 500b5c09d3
commit 9d27a12df7
10 changed files with 22 additions and 523 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
nq/include/Makefile.am
View File

@ -2,6 +2,6 @@
EXTRA_DIST= chase.h client.h conproc.h \
game.h host.h net.h net_bw.h \
net_dgrm.h net_ipx.h net_loop.h net_mp.h net_ser.h net_udp.h \
net_vcr.h net_wins.h net_wipx.h progdefs.h progdefs.q1 \
progdefs.q2 protocol.h \
net_vcr.h net_wins.h net_wipx.h \
protocol.h \
server.h sv_pr_cmds.h sv_progs.h world.h

33
nq/include/progdefs.h
View File

@ -1,33 +0,0 @@
/*
progdefs.h
@description@
Copyright (C) 1996-1997 Id Software, Inc.
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
as published by the Free Software Foundation; either version 2
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.
See the GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with this program; if not, write to:
Free Software Foundation, Inc.
59 Temple Place - Suite 330
Boston, MA 02111-1307, USA
$Id$
*/
#ifdef QUAKE2
#include "progdefs.q2"
#else
#include "progdefs.q1"
#endif

143
nq/include/progdefs.q1
View File

@ -1,143 +0,0 @@
/* file generated by qcc, do not modify */
typedef struct
{ 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 total_secrets;
float total_monsters;
float found_secrets;
float killed_monsters;
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 PlayerPreThink;
func_t PlayerPostThink;
func_t ClientKill;
func_t ClientConnect;
func_t PutClientInServer;
func_t ClientDisconnect;
func_t SetNewParms;
func_t SetChangeParms;
} globalvars_t;
typedef struct
{
float modelindex;
vec3_t absmin;
vec3_t absmax;
float ltime;
float movetype;
float solid;
vec3_t origin;
vec3_t oldorigin;
vec3_t velocity;
vec3_t angles;
vec3_t avelocity;
vec3_t punchangle;
string_t classname;
string_t model;
float frame;
float skin;
float effects;
vec3_t mins;
vec3_t maxs;
vec3_t size;
func_t touch;
func_t use;
func_t think;
func_t blocked;
float nextthink;
int groundentity;
float health;
float frags;
float weapon;
string_t weaponmodel;
float weaponframe;
float currentammo;
float ammo_shells;
float ammo_nails;
float ammo_rockets;
float ammo_cells;
float items;
float takedamage;
int chain;
float deadflag;
vec3_t view_ofs;
float button0;
float button1;
float button2;
float impulse;
float fixangle;
vec3_t v_angle;
float idealpitch;
string_t netname;
int enemy;
float flags;
float colormap;
float team;
float max_health;
float teleport_time;
float armortype;
float armorvalue;
float waterlevel;
float watertype;
float ideal_yaw;
float yaw_speed;
int aiment;
int goalentity;
float spawnflags;
string_t target;
string_t targetname;
float dmg_take;
float dmg_save;
int dmg_inflictor;
int owner;
vec3_t movedir;
string_t message;
float sounds;
string_t noise;
string_t noise1;
string_t noise2;
string_t noise3;
} entvars_t;
#define PROGHEADER_CRC 5927

158
nq/include/progdefs.q2
View File

@ -1,158 +0,0 @@
/* file generated by qcc, do not modify */
typedef struct
{ int pad[28];
int self;
int other;
int world;
float time;
float frametime;
float force_retouch;
string_t mapname;
string_t startspot;
float deathmatch;
float coop;
float teamplay;
float serverflags;
float total_secrets;
float total_monsters;
float found_secrets;
float killed_monsters;
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;
string_t null;
func_t main;
func_t StartFrame;
func_t PlayerPreThink;
func_t PlayerPostThink;
func_t ClientKill;
func_t ClientConnect;
func_t PutClientInServer;
func_t ClientDisconnect;
func_t SetNewParms;
func_t SetChangeParms;
} globalvars_t;
typedef struct
{
float modelindex;
vec3_t absmin;
vec3_t absmax;
float ltime;
float movetype;
float solid;
vec3_t origin;
vec3_t oldorigin;
vec3_t velocity;
vec3_t angles;
vec3_t avelocity;
vec3_t basevelocity;
vec3_t punchangle;
string_t classname;
string_t model;
float frame;
float skin;
float effects;
float drawPercent;
float gravity;
float mass;
float light_level;
vec3_t mins;
vec3_t maxs;
vec3_t size;
func_t touch;
func_t use;
func_t think;
func_t blocked;
float nextthink;
int groundentity;
float health;
float frags;
float weapon;
string_t weaponmodel;
float weaponframe;
float currentammo;
float ammo_shells;
float ammo_nails;
float ammo_rockets;
float ammo_cells;
float items;
float items2;
float takedamage;
int chain;
float deadflag;
vec3_t view_ofs;
float button0;
float button1;
float button2;
float impulse;
float fixangle;
vec3_t v_angle;
float idealpitch;
float pitch_speed;
string_t netname;
int enemy;
float flags;
float colormap;
float team;
float max_health;
float teleport_time;
float armortype;
float armorvalue;
float waterlevel;
float watertype;
float ideal_yaw;
float yaw_speed;
int aiment;
int goalentity;
float spawnflags;
string_t target;
string_t targetname;
float dmg_take;
float dmg_save;
int dmg_inflictor;
int owner;
vec3_t movedir;
string_t message;
float sounds;
string_t noise;
string_t noise1;
string_t noise2;
string_t noise3;
float dmg;
float dmgtime;
float air_finished;
float pain_finished;
float radsuit_finished;
float speed;
} entvars_t;
#define PROGHEADER_CRC 31586

3
nq/source/sv_progs.c
View File

@ -42,10 +42,11 @@
#include "host.h"
#include "server.h"
#include "progdefs.h" // must be after "server.h"
#include "sv_progs.h"
#include "world.h"
#define PROGHEADER_CRC 5927
progs_t sv_pr_state;
sv_globals_t sv_globals;
sv_funcs_t sv_funcs;

2
qw/include/Makefile.am
View File

@ -4,6 +4,6 @@ AUTOMAKE_OPTIONS= foreign
EXTRA_DIST = bothdefs.h cl_cam.h cl_demo.h cl_ents.h cl_input.h \
cl_main.h cl_parse.h cl_pred.h cl_skin.h cl_slist.h cl_tent.h client.h \
crudefile.h game.h host.h \
msg_ucmd.h net.h pmove.h progdefs.h \
msg_ucmd.h net.h pmove.h \
protocol.h server.h \
sv_pr_cmds.h sv_progs.h world.h

167
qw/include/progdefs.h
View File

@ -1,167 +0,0 @@
/*
progdefs.h
(description)
Copyright (C) 1996-1997 Id Software, Inc.
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
as published by the Free Software Foundation; either version 2
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.
See the GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with this program; if not, write to:
Free Software Foundation, Inc.
59 Temple Place - Suite 330
Boston, MA 02111-1307, USA
$Id$
*/
/* file generated by qcc, do not modify */
typedef struct
{ int pad[28];
int self;
int other;
int world;
float time;
float frametime;
int newmis;
float force_retouch;
string_t mapname;
float serverflags;
float total_secrets;
float total_monsters;
float found_secrets;
float killed_monsters;
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 PlayerPreThink;
func_t PlayerPostThink;
func_t ClientKill;
func_t ClientConnect;
func_t PutClientInServer;
func_t ClientDisconnect;
func_t SetNewParms;
func_t SetChangeParms;
} globalvars_t;
typedef struct
{
float modelindex;
vec3_t absmin;
vec3_t absmax;
float ltime;
float lastruntime;
float movetype;
float solid;
vec3_t origin;
vec3_t oldorigin;
vec3_t velocity;
vec3_t angles;
vec3_t avelocity;
string_t classname;
string_t model;
float frame;
float skin;
float effects;
vec3_t mins;
vec3_t maxs;
vec3_t size;
func_t touch;
func_t use;
func_t think;
func_t blocked;
float nextthink;
int groundentity;
float health;
float frags;
float weapon;
string_t weaponmodel;
float weaponframe;
float currentammo;
float ammo_shells;
float ammo_nails;
float ammo_rockets;
float ammo_cells;
float items;
float takedamage;
int chain;
float deadflag;
vec3_t view_ofs;
float button0;
float button1;
float button2;
float impulse;
float fixangle;
vec3_t v_angle;
string_t netname;
int enemy;
float flags;
float colormap;
float team;
float max_health;
float teleport_time;
float armortype;
float armorvalue;
float waterlevel;
float watertype;
float ideal_yaw;
float yaw_speed;
int aiment;
int goalentity;
float spawnflags;
string_t target;
string_t targetname;
float dmg_take;
float dmg_save;
int dmg_inflictor;
int owner;
vec3_t movedir;
string_t message;
float sounds;
string_t noise;
string_t noise1;
string_t noise2;
string_t noise3;
} entvars_t;
#define PROGHEADER_CRC 54730

29
qw/include/server.h
View File

@ -32,7 +32,6 @@
#include "QF/gcc_attr.h"
#include "QF/model.h"
#include "QF/progs.h"
#include "QF/sizebuf.h"
#include "QF/info.h"
#include "QF/vfile.h"
@ -80,8 +79,8 @@ typedef struct
struct model_s *models[MAX_MODELS];
int num_edicts; // increases towards MAX_EDICTS
edict_t *edicts; // can NOT be array indexed, because
// edict_t is variable sized, but can
struct edict_s *edicts; // can NOT be array indexed, because
// struct edict_s is variable sized, but can
// be used to reference the world ent
byte *pvs, *phs; // fully expanded and decompressed
@ -162,7 +161,7 @@ typedef struct client_s
float maxspeed; // localized maxspeed
float entgravity; // localized ent gravity
edict_t *edict; // EDICT_NUM(clientnum+1)
struct edict_s *edict; // EDICT_NUM(clientnum+1)
char name[32]; // for printing to other people
// extracted from userinfo
int messagelevel; // for filtering printed messages
@ -392,7 +391,7 @@ extern server_t sv; // local server
extern client_t *host_client;
extern edict_t *sv_player;
extern struct edict_s *sv_player;
extern char localmodels[MAX_MODELS][5]; // inline model names for precache
@ -405,7 +404,7 @@ extern VFile *sv_fraglogfile;
extern double sv_frametime;
extern double realtime;
extern progs_t sv_pr_state;
extern struct progs_s sv_pr_state;
//===========================================================
// FIXME: declare exported functions in their own relevant .h
@ -432,8 +431,8 @@ void SV_FullClientUpdate (client_t *client, sizebuf_t *buf);
int SV_ModelIndex (const char *name);
qboolean SV_CheckBottom (edict_t *ent);
qboolean SV_movestep (edict_t *ent, vec3_t move, qboolean relink);
qboolean SV_CheckBottom (struct edict_s *ent);
qboolean SV_movestep (struct edict_s *ent, vec3_t move, qboolean relink);
void SV_WriteClientdataToMessage (client_t *client, sizebuf_t *msg);
@ -442,7 +441,7 @@ void SV_MoveToGoal (struct progs_s *pr);
void SV_SaveSpawnparms (void);
void SV_Physics_Client (edict_t *ent);
void SV_Physics_Client (struct edict_s *ent);
void SV_ExecuteUserCommand (const char *s);
void SV_InitOperatorCommands (void);
@ -466,12 +465,12 @@ void SV_FlushSignon (void);
//
void SV_ProgStartFrame (void);
void SV_Physics (void);
void SV_CheckVelocity (edict_t *ent);
void SV_AddGravity (edict_t *ent, float scale);
qboolean SV_RunThink (edict_t *ent);
void SV_Physics_Toss (edict_t *ent);
void SV_CheckVelocity (struct edict_s *ent);
void SV_AddGravity (struct edict_s *ent, float scale);
qboolean SV_RunThink (struct edict_s *ent);
void SV_Physics_Toss (struct edict_s *ent);
void SV_RunNewmis (void);
void SV_Impact (edict_t *e1, edict_t *e2);
void SV_Impact (struct edict_s *e1, struct edict_s *e2);
void SV_SetMoveVars(void);
//
@ -481,7 +480,7 @@ void SV_Printf (const char *fmt, ...) __attribute__((format(printf,1,2)));
void SV_SendClientMessages (void);
void SV_Multicast (vec3_t origin, int to);
void SV_StartSound (edict_t *entity, int channel, const char *sample, int volume,
void SV_StartSound (struct edict_s *entity, int channel, const char *sample, int volume,
float attenuation);
void SV_ClientPrintf (client_t *cl, int level, const char *fmt, ...) __attribute__((format(printf,3,4)));
void SV_BroadcastPrintf (int level, const char *fmt, ...) __attribute__((format(printf,2,3)));

1
qw/include/world.h
View File

@ -32,7 +32,6 @@
#include "QF/mathlib.h"
#include "QF/model.h"
#include "QF/progs.h"
typedef struct
{

5
qw/source/sv_progs.c
View File

@ -38,14 +38,15 @@
#endif
#include "QF/cmd.h"
#include "compat.h"
#include "QF/cvar.h"
#include "compat.h"
#include "server.h"
#include "progdefs.h"
#include "sv_progs.h"
#include "world.h"
#define PROGHEADER_CRC 54730
sv_globals_t sv_globals;
sv_funcs_t sv_funcs;
sv_fields_t sv_fields;