qf/quakeforge
0
0
Fork 0
mirror of https://git.code.sf.net/p/quake/quakeforge synced 2025-02-27 14:10:58 +00:00
Code Issues Projects Releases Packages Wiki Activity

diff reduction and maybe a couple speedups

Browse source
This commit is contained in:
Bill Currie 2003-05-29 04:49:34 +00:00
parent 1c1e6e17c4
commit 016743c3ab
4 changed files with 286 additions and 224 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
nq/include/server.h
View file

@ -74,7 +74,7 @@ typedef struct
const char *model_precache[MAX_MODELS]; // NULL terminated const char *model_precache[MAX_MODELS]; // NULL terminated
struct model_s *models[MAX_MODELS]; struct model_s *models[MAX_MODELS];
const char *sound_precache[MAX_SOUNDS]; // NULL terminated const char *sound_precache[MAX_SOUNDS]; // NULL terminated
char *lightstyles[MAX_LIGHTSTYLES]; const char *lightstyles[MAX_LIGHTSTYLES];
int num_edicts; int num_edicts;
int max_edicts; int max_edicts;
edict_t *edicts; // can NOT be array indexed, because edict_t *edicts; // can NOT be array indexed, because

6
nq/source/host_cmd.c
View file

@ -583,10 +583,12 @@ Host_Loadgame_f (void)
// load the light styles // load the light styles
for (i = 0; i < MAX_LIGHTSTYLES; i++) { for (i = 0; i < MAX_LIGHTSTYLES; i++) {
char *s;
Qgets (f, buf, sizeof (buf)); Qgets (f, buf, sizeof (buf));
sscanf (buf, "%s\n", str); sscanf (buf, "%s\n", str);
sv.lightstyles[i] = Hunk_Alloc (strlen (str) + 1); s = Hunk_Alloc (strlen (str) + 1);
strcpy (sv.lightstyles[i], str); strcpy (s, str);
sv.lightstyles[i] = s;
} }
// load the edicts out of the savegame file // load the edicts out of the savegame file

112
nq/source/sv_pr_cmds.c
View file

@ -1,7 +1,7 @@
/* /*
pr->pr_cmds.c sv_pr_cmds.c
@description@ (description)
Copyright (C) 1996-1997 Id Software, Inc. Copyright (C) 1996-1997 Id Software, Inc.
@ -53,8 +53,8 @@ static __attribute__ ((unused)) const char rcsid[] =
#include "sv_progs.h" #include "sv_progs.h"
#include "world.h" #include "world.h"
/* BUILT-IN FUNCTIONS */
// BUILT-IN FUNCTIONS =========================================================
/* /*
PF_error PF_error
@ -72,7 +72,7 @@ PF_error (progs_t *pr)
s = PF_VarString (pr, 0); s = PF_VarString (pr, 0);
Con_Printf ("======SERVER ERROR in %s:\n%s\n", Con_Printf ("======SERVER ERROR in %s:\n%s\n",
PR_GetString (&sv_pr_state, pr->pr_xfunction->s_name), s); PR_GetString (pr, pr->pr_xfunction->s_name), s);
ed = PROG_TO_EDICT (pr, *sv_globals.self); ed = PROG_TO_EDICT (pr, *sv_globals.self);
ED_Print (pr, ed); ED_Print (pr, ed);
@ -95,7 +95,7 @@ PF_objerror (progs_t *pr)
s = PF_VarString (pr, 0); s = PF_VarString (pr, 0);
Con_Printf ("======OBJECT ERROR in %s:\n%s\n", Con_Printf ("======OBJECT ERROR in %s:\n%s\n",
PR_GetString (&sv_pr_state, pr->pr_xfunction->s_name), s); PR_GetString (pr, pr->pr_xfunction->s_name), s);
ed = PROG_TO_EDICT (pr, *sv_globals.self); ed = PROG_TO_EDICT (pr, *sv_globals.self);
ED_Print (pr, ed); ED_Print (pr, ed);
ED_Free (pr, ed); ED_Free (pr, ed);
@ -238,8 +238,8 @@ PF_setmodel (progs_t *pr)
{ {
edict_t *e; edict_t *e;
const char *m, **check; const char *m, **check;
model_t *mod;
int i; int i;
model_t *mod;
e = P_EDICT (pr, 0); e = P_EDICT (pr, 0);
m = P_GSTRING (pr, 1); m = P_GSTRING (pr, 1);
@ -252,7 +252,6 @@ PF_setmodel (progs_t *pr)
if (!*check) if (!*check)
PR_RunError (pr, "no precache: %s\n", m); PR_RunError (pr, "no precache: %s\n", m);
SVstring (e, model) = PR_SetString (pr, m); SVstring (e, model) = PR_SetString (pr, m);
SVfloat (e, modelindex) = i; // SV_ModelIndex (m); SVfloat (e, modelindex) = i; // SV_ModelIndex (m);
@ -319,7 +318,7 @@ void
PF_centerprint (progs_t *pr) PF_centerprint (progs_t *pr)
{ {
const char *s; const char *s;
client_t *client; client_t *cl;
int entnum; int entnum;
entnum = P_EDICTNUM (pr, 0); entnum = P_EDICTNUM (pr, 0);
@ -330,17 +329,12 @@ PF_centerprint (progs_t *pr)
return; return;
} }
client = &svs.clients[entnum - 1]; cl = &svs.clients[entnum - 1];
MSG_WriteByte (&client->message, svc_centerprint); MSG_WriteByte (&cl->message, svc_centerprint);
MSG_WriteString (&client->message, s); MSG_WriteString (&cl->message, s);
} }
/*
PF_particle
particle (origin, color, count)
*/
void void
PF_particle (progs_t *pr) PF_particle (progs_t *pr)
{ {
@ -355,6 +349,9 @@ PF_particle (progs_t *pr)
SV_StartParticle (org, dir, color, count); SV_StartParticle (org, dir, color, count);
} }
/*
PF_ambientsound
*/
void void
PF_ambientsound (progs_t *pr) PF_ambientsound (progs_t *pr)
{ {
@ -404,9 +401,9 @@ void
PF_sound (progs_t *pr) PF_sound (progs_t *pr)
{ {
const char *sample; const char *sample;
edict_t *entity;
float attenuation; float attenuation;
int channel, volume; int channel, volume;
edict_t *entity;
entity = P_EDICT (pr, 0); entity = P_EDICT (pr, 0);
channel = P_FLOAT (pr, 1); channel = P_FLOAT (pr, 1);
@ -424,7 +421,6 @@ PF_sound (progs_t *pr)
SV_StartSound (entity, channel, sample, volume, attenuation); SV_StartSound (entity, channel, sample, volume, attenuation);
} }
/* /*
PF_traceline PF_traceline
@ -438,8 +434,8 @@ void
PF_traceline (progs_t *pr) PF_traceline (progs_t *pr)
{ {
float *v1, *v2; float *v1, *v2;
int nomonsters;
edict_t *ent; edict_t *ent;
int nomonsters;
trace_t trace; trace_t trace;
v1 = P_VECTOR (pr, 0); v1 = P_VECTOR (pr, 0);
@ -477,21 +473,18 @@ PF_checkpos (progs_t *pr)
{ {
} }
// ============================================================================
byte checkpvs[MAX_MAP_LEAFS / 8]; byte checkpvs[MAX_MAP_LEAFS / 8];
int int
PF_newcheckclient (progs_t *pr, int check) PF_newcheckclient (progs_t *pr, int check)
{ {
int i;
byte *pvs; byte *pvs;
edict_t *ent; edict_t *ent;
int i;
mleaf_t *leaf; mleaf_t *leaf;
vec3_t org; vec3_t org;
// cycle to the next one // cycle to the next one
if (check < 1) if (check < 1)
check = 1; check = 1;
if (check > svs.maxclients) if (check > svs.maxclients)
@ -510,6 +503,7 @@ PF_newcheckclient (progs_t *pr, int check)
if (i == check) if (i == check)
break; // didn't find anything else break; // didn't find anything else
if (ent->free) if (ent->free)
continue; continue;
if (SVfloat (ent, health) <= 0) if (SVfloat (ent, health) <= 0)
@ -579,8 +573,6 @@ PF_checkclient (progs_t *pr)
RETURN_EDICT (pr, ent); RETURN_EDICT (pr, ent);
} }
//============================================================================
/* /*
PF_stuffcmd PF_stuffcmd
@ -609,7 +601,7 @@ PF_stuffcmd (progs_t *pr)
/* /*
PF_localcmd PF_localcmd
Sends text over to the client's execution buffer Inserts text into the server console's execution buffer
localcmd (string) localcmd (string)
*/ */
@ -756,11 +748,11 @@ PF_precache_model (progs_t *pr)
void void
PF_walkmove (progs_t *pr) PF_walkmove (progs_t *pr)
{ {
dfunction_t *oldf;
edict_t *ent; edict_t *ent;
float yaw, dist; float yaw, dist;
vec3_t move;
dfunction_t *oldf;
int oldself; int oldself;
vec3_t move;
ent = PROG_TO_EDICT (pr, *sv_globals.self); ent = PROG_TO_EDICT (pr, *sv_globals.self);
yaw = P_FLOAT (pr, 0); yaw = P_FLOAT (pr, 0);
@ -783,7 +775,6 @@ PF_walkmove (progs_t *pr)
R_FLOAT (pr) = SV_movestep (ent, move, true); R_FLOAT (pr) = SV_movestep (ent, move, true);
// restore program state // restore program state
pr->pr_xfunction = oldf; pr->pr_xfunction = oldf;
*sv_globals.self = oldself; *sv_globals.self = oldself;
@ -798,16 +789,15 @@ void
PF_droptofloor (progs_t *pr) PF_droptofloor (progs_t *pr)
{ {
edict_t *ent; edict_t *ent;
vec3_t end;
trace_t trace; trace_t trace;
vec3_t end;
ent = PROG_TO_EDICT (pr, *sv_globals.self); ent = PROG_TO_EDICT (pr, *sv_globals.self);
VectorCopy (SVvector (ent, origin), end); VectorCopy (SVvector (ent, origin), end);
end[2] -= 256; end[2] -= 256;
trace = SV_Move (SVvector (ent, origin), trace = SV_Move (SVvector (ent, origin), SVvector (ent, mins),
SVvector (ent, mins),
SVvector (ent, maxs), end, false, ent); SVvector (ent, maxs), end, false, ent);
if (trace.fraction == 1 || trace.allsolid) { if (trace.fraction == 1 || trace.allsolid) {
@ -829,10 +819,9 @@ PF_droptofloor (progs_t *pr)
void void
PF_lightstyle (progs_t *pr) PF_lightstyle (progs_t *pr)
{ {
int style; const char *val;
char *val;
client_t *client; client_t *client;
int j; int style, j;
style = P_FLOAT (pr, 0); style = P_FLOAT (pr, 0);
val = P_GSTRING (pr, 1); val = P_GSTRING (pr, 1);
@ -885,6 +874,7 @@ PF_aim (progs_t *pr)
{ {
edict_t *ent, *check, *bestent; edict_t *ent, *check, *bestent;
float dist, bestdist, speed; float dist, bestdist, speed;
float *mins, *maxs, *org;
int i, j; int i, j;
trace_t tr; trace_t tr;
vec3_t start, dir, end, bestdir; vec3_t start, dir, end, bestdir;
@ -905,6 +895,7 @@ PF_aim (progs_t *pr)
VectorCopy (*sv_globals.v_forward, R_VECTOR (pr)); VectorCopy (*sv_globals.v_forward, R_VECTOR (pr));
return; return;
} }
// try all possible entities // try all possible entities
VectorCopy (dir, bestdir); VectorCopy (dir, bestdir);
bestdist = sv_aim->value; bestdist = sv_aim->value;
@ -920,9 +911,11 @@ PF_aim (progs_t *pr)
&& SVfloat (ent, team) == SVfloat (check, team)) && SVfloat (ent, team) == SVfloat (check, team))
continue; // don't aim at teammate continue; // don't aim at teammate
mins = SVvector (check, mins);
maxs = SVvector (check, maxs);
org = SVvector (check, origin);
for (j = 0; j < 3; j++) for (j = 0; j < 3; j++)
end[j] = SVvector (check, origin)[j] + 0.5 end[j] = org[j] + 0.5 * (mins[j] + maxs[j]);
* (SVvector (check, mins)[j] + SVvector (check, maxs)[j]);
VectorSubtract (end, start, dir); VectorSubtract (end, start, dir);
VectorNormalize (dir); VectorNormalize (dir);
dist = DotProduct (dir, *sv_globals.v_forward); dist = DotProduct (dir, *sv_globals.v_forward);
@ -985,7 +978,7 @@ PF_changeyaw (progs_t *pr)
SVvector (ent, angles)[1] = anglemod (current + move); SVvector (ent, angles)[1] = anglemod (current + move);
} }
// MESSAGE WRITING ============================================================ /* MESSAGE WRITING */
#define MSG_BROADCAST 0 // unreliable to all #define MSG_BROADCAST 0 // unreliable to all
#define MSG_ONE 1 // reliable to one (msg_entity) #define MSG_ONE 1 // reliable to one (msg_entity)
@ -1078,14 +1071,15 @@ PF_WriteEntity (progs_t *pr)
void void
PF_makestatic (progs_t *pr) PF_makestatic (progs_t *pr)
{ {
const char *model;
edict_t *ent; edict_t *ent;
ent = P_EDICT (pr, 0); ent = P_EDICT (pr, 0);
MSG_WriteByte (&sv.signon, svc_spawnstatic); MSG_WriteByte (&sv.signon, svc_spawnstatic);
MSG_WriteByte (&sv.signon, model = PR_GetString (pr, SVstring (ent, model));
SV_ModelIndex (PR_GetString (pr, SVstring (ent, model)))); MSG_WriteByte (&sv.signon, SV_ModelIndex (model));
MSG_WriteByte (&sv.signon, SVfloat (ent, frame)); MSG_WriteByte (&sv.signon, SVfloat (ent, frame));
MSG_WriteByte (&sv.signon, SVfloat (ent, colormap)); MSG_WriteByte (&sv.signon, SVfloat (ent, colormap));
@ -1093,23 +1087,17 @@ PF_makestatic (progs_t *pr)
MSG_WriteCoordAngleV (&sv.signon, SVvector (ent, origin), MSG_WriteCoordAngleV (&sv.signon, SVvector (ent, origin),
SVvector (ent, angles)); SVvector (ent, angles));
/* for (i = 0; i < 3; i++) { // FIXME: DESPAIR
MSG_WriteCoord (&sv.signon, SVvector (ent, origin)[i]);
MSG_WriteAngle (&sv.signon, SVvector (ent, angles)[i]);
} */
// throw the entity away now // throw the entity away now
ED_Free (pr, ent); ED_Free (pr, ent);
} }
// ============================================================================
void void
PF_setspawnparms (progs_t *pr) PF_setspawnparms (progs_t *pr)
{ {
client_t *client;
edict_t *ent; edict_t *ent;
int i; int i;
client_t *client;
ent = P_EDICT (pr, 0); ent = P_EDICT (pr, 0);
i = NUM_FOR_EDICT (pr, ent); i = NUM_FOR_EDICT (pr, ent);
@ -1126,7 +1114,7 @@ PF_setspawnparms (progs_t *pr)
void void
PF_changelevel (progs_t *pr) PF_changelevel (progs_t *pr)
{ {
char *s; const char *s;
// make sure we don't issue two changelevels // make sure we don't issue two changelevels
if (svs.changelevel_issued) if (svs.changelevel_issued)
@ -1159,11 +1147,11 @@ PF_hullpointcontents (progs_t *pr)
static void static void
PF_getboxbounds (progs_t *pr) PF_getboxbounds (progs_t *pr)
{ {
int h = P_INT (pr, 0) - 1;
clip_hull_t *ch; clip_hull_t *ch;
int h = P_INT (pr, 0) - 1;
if (h < 0 || h > MAX_PF_HULLS - 1 || !(ch = pf_hull_list[h])) if (h < 0 || h > MAX_PF_HULLS - 1 || !(ch = pf_hull_list[h]))
PR_RunError (pr, "PF_freeboxhull: invalid box hull handle\n"); PR_RunError (pr, "PF_getboxbounds: invalid box hull handle\n");
if (P_INT (pr, 1)) { if (P_INT (pr, 1)) {
VectorCopy (ch->maxs, R_VECTOR (pr)); VectorCopy (ch->maxs, R_VECTOR (pr));
@ -1228,31 +1216,31 @@ calc_dist (vec3_t p, vec3_t n, vec3_t *offsets)
static void static void
PF_rotate_bbox (progs_t *pr) PF_rotate_bbox (progs_t *pr)
{ {
int h = P_INT (pr, 0) - 1; clip_hull_t *ch;
float l;
float *mi = P_VECTOR (pr, 4);
float *ma = P_VECTOR (pr, 5);
float *dir[3] = { float *dir[3] = {
P_VECTOR (pr, 1), P_VECTOR (pr, 1),
P_VECTOR (pr, 2), P_VECTOR (pr, 2),
P_VECTOR (pr, 3), P_VECTOR (pr, 3),
}; };
float *mi = P_VECTOR (pr, 4);
float *ma = P_VECTOR (pr, 5);
vec3_t mins, maxs; hull_t *hull;
int i, j;
int h = P_INT (pr, 0) - 1;
vec3_t mins, maxs, d;
float *verts[6] = {maxs, mins, maxs, mins, maxs, mins}; float *verts[6] = {maxs, mins, maxs, mins, maxs, mins};
vec3_t v[8];
vec3_t offsets[3][2] = { vec3_t offsets[3][2] = {
{ { 0, 0, 0 }, { 0, 0, 0} }, { { 0, 0, 0 }, { 0, 0, 0} },
{ { -16, -16, -32 }, { 16, 16, 24} }, { { -16, -16, -32 }, { 16, 16, 24} },
{ { -32, -32, -64 }, { 32, 32, 24} }, { { -32, -32, -64 }, { 32, 32, 24} },
}; };
vec3_t v[8], d;
hull_t *hull;
clip_hull_t *ch;
int i, j;
float l;
if (h < 0 || h > MAX_PF_HULLS - 1 || !(ch = pf_hull_list[h])) if (h < 0 || h > MAX_PF_HULLS - 1 || !(ch = pf_hull_list[h]))
PR_RunError (pr, "PF_freeboxhull: invalid box hull handle\n"); PR_RunError (pr, "PF_rotate_bbox: invalid box hull handle\n");
// set up the rotation matrix. the three orientation vectors form the // set up the rotation matrix. the three orientation vectors form the
// columns of the rotation matrix // columns of the rotation matrix
@ -1306,7 +1294,7 @@ PF_rotate_bbox (progs_t *pr)
void void
PF_Fixme (progs_t *pr) PF_Fixme (progs_t *pr)
{ {
PR_RunError (pr, "unimplemented bulitin"); PR_RunError (pr, "unimplemented bulitin function called");
} }

280
qw/source/sv_pr_cmds.c
View file

@ -321,9 +321,7 @@ PF_ambientsound (progs_t *pr)
// add an svc_spawnambient command to the level signon packet // add an svc_spawnambient command to the level signon packet
MSG_WriteByte (&sv.signon, svc_spawnstaticsound); MSG_WriteByte (&sv.signon, svc_spawnstaticsound);
MSG_WriteCoordV (&sv.signon, pos); MSG_WriteCoordV (&sv.signon, pos);
MSG_WriteByte (&sv.signon, soundnum); MSG_WriteByte (&sv.signon, soundnum);
MSG_WriteByte (&sv.signon, vol * 255); MSG_WriteByte (&sv.signon, vol * 255);
MSG_WriteByte (&sv.signon, attenuation * 64); MSG_WriteByte (&sv.signon, attenuation * 64);
@ -361,7 +359,7 @@ PF_sound (progs_t *pr)
/* /*
PF_traceline PF_traceline
Used for use tracing and shot targeting Used for use tracing and shot targeting.
Traces are blocked by bbox and exact bsp entityes, and also slide box Traces are blocked by bbox and exact bsp entityes, and also slide box
entities if the tryents flag is set. entities if the tryents flag is set.
@ -503,8 +501,8 @@ int c_invis, c_notvis;
/* /*
PF_checkclient PF_checkclient
Returns a client (or object that has a client enemy) that would be a valid Returns a client (or object that has a client enemy) that would be a
target. valid target.
If there are more than one valid options, they are cycled each frame If there are more than one valid options, they are cycled each frame
@ -811,9 +809,9 @@ PF_droptofloor (progs_t *pr)
trace = SV_Move (SVvector (ent, origin), SVvector (ent, mins), trace = SV_Move (SVvector (ent, origin), SVvector (ent, mins),
SVvector (ent, maxs), end, false, ent); SVvector (ent, maxs), end, false, ent);
if (trace.fraction == 1 || trace.allsolid) if (trace.fraction == 1 || trace.allsolid) {
R_FLOAT (pr) = 0; R_FLOAT (pr) = 0;
else { } else {
VectorCopy (trace.endpos, SVvector (ent, origin)); VectorCopy (trace.endpos, SVvector (ent, origin));
SV_LinkEdict (ent, false); SV_LinkEdict (ent, false);
SVfloat (ent, flags) = (int) SVfloat (ent, flags) | FL_ONGROUND; SVfloat (ent, flags) = (int) SVfloat (ent, flags) | FL_ONGROUND;
@ -859,9 +857,6 @@ PF_lightstyle (progs_t *pr)
} }
} }
/*
PF_checkbottom
*/
void void
PF_checkbottom (progs_t *pr) PF_checkbottom (progs_t *pr)
{ {
@ -893,13 +888,13 @@ cvar_t *sv_aim;
void void
PF_aim (progs_t *pr) PF_aim (progs_t *pr)
{ {
const char *noaim;
edict_t *ent, *check, *bestent; edict_t *ent, *check, *bestent;
vec3_t start, dir, end, bestdir; float dist, bestdist, speed;
float *mins, *maxs, *org;
int i, j; int i, j;
trace_t tr; trace_t tr;
float dist, bestdist; vec3_t start, dir, end, bestdir;
float speed;
const char *noaim;
if (sv_aim->value >= 1.0) { if (sv_aim->value >= 1.0) {
VectorCopy (*sv_globals.v_forward, R_VECTOR (pr)); VectorCopy (*sv_globals.v_forward, R_VECTOR (pr));
@ -945,11 +940,14 @@ PF_aim (progs_t *pr)
if (check == ent) if (check == ent)
continue; continue;
if (teamplay->int_val && SVfloat (ent, team) > 0 if (teamplay->int_val && SVfloat (ent, team) > 0
&& SVfloat (ent, team) == SVfloat (check, team)) continue; && SVfloat (ent, team) == SVfloat (check, team))
// don't aim at teammate continue; // don't aim at teammate
mins = SVvector (check, mins);
maxs = SVvector (check, maxs);
org = SVvector (check, origin);
for (j = 0; j < 3; j++) for (j = 0; j < 3; j++)
end[j] = SVvector (check, origin)[j] + 0.5 * end[j] = org[j] + 0.5 * (mins[j] + maxs[j]);
(SVvector (check, mins)[j] + SVvector (check, maxs)[j]);
VectorSubtract (end, start, dir); VectorSubtract (end, start, dir);
VectorNormalize (dir); VectorNormalize (dir);
dist = DotProduct (dir, *sv_globals.v_forward); dist = DotProduct (dir, *sv_globals.v_forward);
@ -1032,13 +1030,6 @@ WriteDest (progs_t *pr)
case MSG_ONE: case MSG_ONE:
Sys_Error ("Shouldn't be at MSG_ONE"); Sys_Error ("Shouldn't be at MSG_ONE");
#if 0
ent = PROG_TO_EDICT (pr, *sv_globals.msg_entity);
entnum = NUM_FOR_EDICT (pr, ent);
if (entnum < 1 || entnum > MAX_CLIENTS)
PR_RunError (pr, "WriteDest: not a client");
return &svs.clients[entnum - 1].netchan.message;
#endif
case MSG_ALL: case MSG_ALL:
return &sv.reliable_datagram; return &sv.reliable_datagram;
@ -1300,7 +1291,6 @@ PF_makestatic (progs_t *pr)
MSG_WriteByte (&sv.signon, svc_spawnstatic); MSG_WriteByte (&sv.signon, svc_spawnstatic);
model = PR_GetString (pr, SVstring (ent, model)); model = PR_GetString (pr, SVstring (ent, model));
// SV_Printf ("Model: %d %s\n", SVstring (ent, model), model);
MSG_WriteByte (&sv.signon, SV_ModelIndex (model)); MSG_WriteByte (&sv.signon, SV_ModelIndex (model));
MSG_WriteByte (&sv.signon, SVfloat (ent, frame)); MSG_WriteByte (&sv.signon, SVfloat (ent, frame));
@ -1309,6 +1299,7 @@ PF_makestatic (progs_t *pr)
MSG_WriteCoordAngleV (&sv.signon, SVvector (ent, origin), MSG_WriteCoordAngleV (&sv.signon, SVvector (ent, origin),
SVvector (ent, angles)); SVvector (ent, angles));
// throw the entity away now // throw the entity away now
ED_Free (pr, ent); ED_Free (pr, ent);
} }
@ -1733,7 +1724,6 @@ PF_rotate_bbox (progs_t *pr)
VectorCopy (v[0], ch->mins); VectorCopy (v[0], ch->mins);
VectorCopy (v[0], ch->maxs); VectorCopy (v[0], ch->maxs);
for (i = 0; i < 8; i++) { for (i = 0; i < 8; i++) {
//SV_Printf ("'%0.1f %0.1f %0.1f'\n", v[i][0], v[i][1], v[i][2]);
for (j = 0; j < 3; j++) { for (j = 0; j < 3; j++) {
ch->mins[j] = min (ch->mins[j], v[i][j]); ch->mins[j] = min (ch->mins[j], v[i][j]);
ch->maxs[j] = max (ch->maxs[j], v[i][j]); ch->maxs[j] = max (ch->maxs[j], v[i][j]);
@ -1751,10 +1741,6 @@ PF_rotate_bbox (progs_t *pr)
offsets[j]); offsets[j]);
hull->planes[i].type = 4; hull->planes[i].type = 4;
VectorCopy (dir[i / 2], hull->planes[i].normal); VectorCopy (dir[i / 2], hull->planes[i].normal);
// SV_Printf ("%f %f %f %f\n",
// hull->planes[i].dist,
// hull->planes[i].normal[0], hull->planes[i].normal[1],
// hull->planes[i].normal[2]);
} }
} }
} }
@ -1766,7 +1752,7 @@ PF_Fixme (progs_t *pr)
} }
static void static void
PF_Checkextension (progs_t *pr) PF_checkextension (progs_t *pr)
{ {
R_FLOAT (pr) = 0; // FIXME: make this function actually useful :P R_FLOAT (pr) = 0; // FIXME: make this function actually useful :P
} }
@ -1877,78 +1863,164 @@ SV_PR_Cmds_Init ()
PR_Cmds_Init (&sv_pr_state); PR_Cmds_Init (&sv_pr_state);
PR_Obj_Progs_Init (&sv_pr_state); PR_Obj_Progs_Init (&sv_pr_state);
sv_pr_state.builtins[45] = 0; // (override standard builtin) // (override standard builtin)
PR_AddBuiltin (&sv_pr_state, "cvar", PF_sv_cvar, 45); // float (string s) cvar sv_pr_state.builtins[45] = 0;
// float (string s) cvar
PR_AddBuiltin (&sv_pr_state, "cvar", PF_sv_cvar, 45);
PR_AddBuiltin (&sv_pr_state, "makevectors", PF_makevectors, 1); // void (entity e) makevectors // void (entity e) makevectors
PR_AddBuiltin (&sv_pr_state, "setorigin", PF_setorigin, 2); // void (entity e, vector o) setorigin PR_AddBuiltin (&sv_pr_state, "makevectors", PF_makevectors, 1);
PR_AddBuiltin (&sv_pr_state, "setmodel", PF_setmodel, 3); // void (entity e, string m) setmodel // void (entity e, vector o) setorigin
PR_AddBuiltin (&sv_pr_state, "setsize", PF_setsize, 4); // void (entity e, vector min, vector max) setsize PR_AddBuiltin (&sv_pr_state, "setorigin", PF_setorigin, 2);
PR_AddBuiltin (&sv_pr_state, "fixme", PF_Fixme, 5); // void (entity e, vector min, vector max) setabssize // void (entity e, string m) setmodel
PR_AddBuiltin (&sv_pr_state, "sound", PF_sound, 8); // void (entity e, float chan, string samp) sound PR_AddBuiltin (&sv_pr_state, "setmodel", PF_setmodel, 3);
PR_AddBuiltin (&sv_pr_state, "error", PF_error, 10); // void (string e) error // void (entity e, vector min, vector max) setsize
PR_AddBuiltin (&sv_pr_state, "objerror", PF_objerror, 11); // void (string e) objerror PR_AddBuiltin (&sv_pr_state, "setsize", PF_setsize, 4);
PR_AddBuiltin (&sv_pr_state, "spawn", PF_Spawn, 14); // entity () spawn // void (entity e, vector min, vector max) setabssize
PR_AddBuiltin (&sv_pr_state, "remove", PF_Remove, 15); // void (entity e) remove PR_AddBuiltin (&sv_pr_state, "fixme", PF_Fixme, 5);
PR_AddBuiltin (&sv_pr_state, "traceline", PF_traceline, 16); // float (vector v1, vector v2, float tryents) traceline
PR_AddBuiltin (&sv_pr_state, "checkclient", PF_checkclient, 17); // entity () clientlist
PR_AddBuiltin (&sv_pr_state, "precache_sound", PF_precache_sound, 19); // void (string s) precache_sound
PR_AddBuiltin (&sv_pr_state, "precache_model", PF_precache_model, 20); // void (string s) precache_model
PR_AddBuiltin (&sv_pr_state, "stuffcmd", PF_stuffcmd, 21); // void (entity client, string s) stuffcmd
PR_AddBuiltin (&sv_pr_state, "findradius", PF_findradius, 22); // entity (vector org, float rad) findradius
PR_AddBuiltin (&sv_pr_state, "bprint", PF_bprint, 23); // void (string s) bprint
PR_AddBuiltin (&sv_pr_state, "sprint", PF_sprint, 24); // void (entity client, string s) sprint
PR_AddBuiltin (&sv_pr_state, "walkmove", PF_walkmove, 32); // float (float yaw, float dist) walkmove
PR_AddBuiltin (&sv_pr_state, "droptofloor", PF_droptofloor, 34); // float () droptofloor
PR_AddBuiltin (&sv_pr_state, "lightstyle", PF_lightstyle, 35); // void (float style, string value) lightstyle
PR_AddBuiltin (&sv_pr_state, "checkbottom", PF_checkbottom, 40); // float (entity e) checkbottom
PR_AddBuiltin (&sv_pr_state, "pointcontents", PF_pointcontents, 41); // float (vector v) pointcontents
PR_AddBuiltin (&sv_pr_state, "aim", PF_aim, 44); // vector (entity e, float speed) aim
PR_AddBuiltin (&sv_pr_state, "localcmd", PF_localcmd, 46); // void (string s) localcmd
PR_AddBuiltin (&sv_pr_state, "changeyaw", PF_changeyaw, 49); // void () ChangeYaw
PR_AddBuiltin (&sv_pr_state, "writebyte", PF_WriteByte, 52); // void (float to, float f) WriteByte
PR_AddBuiltin (&sv_pr_state, "WriteBytes", PF_WriteBytes, -1); // void (float to, ...) WriteBytes
PR_AddBuiltin (&sv_pr_state, "writechar", PF_WriteChar, 53); // void (float to, float f) WriteChar
PR_AddBuiltin (&sv_pr_state, "writeshort", PF_WriteShort, 54); // void (float to, float f) WriteShort
PR_AddBuiltin (&sv_pr_state, "writelong", PF_WriteLong, 55); // void (float to, float f) WriteLong
PR_AddBuiltin (&sv_pr_state, "writecoord", PF_WriteCoord, 56); // void (float to, float f) WriteCoord
PR_AddBuiltin (&sv_pr_state, "writeangle", PF_WriteAngle, 57); // void (float to, float f) WriteAngle
PR_AddBuiltin (&sv_pr_state, "WriteCoordV", PF_WriteCoordV, -1); // void (float to, vector v) WriteCoordV
PR_AddBuiltin (&sv_pr_state, "WriteAngleV", PF_WriteAngleV, -1); // void (float to, vector v) WriteAngleV
PR_AddBuiltin (&sv_pr_state, "writestring", PF_WriteString, 58); // void (float to, string s) WriteString
PR_AddBuiltin (&sv_pr_state, "writeentity", PF_WriteEntity, 59); // void (float to, entity s) WriteEntity
PR_AddBuiltin (&sv_pr_state, "movetogoal", SV_MoveToGoal, 67); // void (float step) movetogoal
PR_AddBuiltin (&sv_pr_state, "precache_file", PF_precache_file, 68); // string (string s) precache_file
PR_AddBuiltin (&sv_pr_state, "makestatic", PF_makestatic, 69); // void (entity e) makestatic
PR_AddBuiltin (&sv_pr_state, "changelevel", PF_changelevel, 70); // void (string s) changelevel
PR_AddBuiltin (&sv_pr_state, "centerprint", PF_centerprint, 73); // void (...) centerprint
PR_AddBuiltin (&sv_pr_state, "ambientsound", PF_ambientsound, 74); // void (vector pos, string samp, float vol, float atten) ambientsound
PR_AddBuiltin (&sv_pr_state, "precache_model2", PF_precache_model, 75); // string (string s) precache_model2
PR_AddBuiltin (&sv_pr_state, "precache_sound2", PF_precache_sound, 76); // string (string s) precache_sound2
PR_AddBuiltin (&sv_pr_state, "precache_file2", PF_precache_file, 77); // string (string s) precache_file2
PR_AddBuiltin (&sv_pr_state, "setspawnparms", PF_setspawnparms, 78); // void (entity e) setspawnparms
PR_AddBuiltin (&sv_pr_state, "logfrag", PF_logfrag, 79); // void (entity killer, entity killee) logfrag
PR_AddBuiltin (&sv_pr_state, "infokey", PF_infokey, 80); // string (entity e, string key) infokey
PR_AddBuiltin (&sv_pr_state, "multicast", PF_multicast, 82); // void (vector where, float set) multicast
PR_AddBuiltin (&sv_pr_state, "testentitypos", PF_testentitypos, 92); // entity (entity ent) testentitypos
PR_AddBuiltin (&sv_pr_state, "hullpointcontents", PF_hullpointcontents, 93); // integer (entity ent, vector point) hullpointcontents
PR_AddBuiltin (&sv_pr_state, "getboxbounds", PF_getboxbounds, 94); // vector (integer hull, integer max) getboxbounds
PR_AddBuiltin (&sv_pr_state, "getboxhull", PF_getboxhull, 95); // integer () getboxhull
PR_AddBuiltin (&sv_pr_state, "freeboxhull", PF_freeboxhull, 96); // void (integer hull) freeboxhull
PR_AddBuiltin (&sv_pr_state, "rotate_bbox", PF_rotate_bbox, 97); // void (integer hull, vector right, vector forward, vector up, vector mins, vector maxs) rotate_bbox
PR_AddBuiltin (&sv_pr_state, "checkmove", PF_checkmove, 98); // void (vector start, vector mins, vector maxs, vector end, float type, entity passent) checkmove
PR_AddBuiltin (&sv_pr_state, "checkextension", PF_Checkextension, 99); // float () checkextension
PR_AddBuiltin (&sv_pr_state, "setinfokey", PF_setinfokey, 102); // void (entity ent, string key, string value) setinfokey
PR_AddBuiltin (&sv_pr_state, "cfopen", PF_cfopen, 103); // float (string path, string mode) cfopen
PR_AddBuiltin (&sv_pr_state, "cfclose", PF_cfclose, 104); // void (float desc) cfclose
PR_AddBuiltin (&sv_pr_state, "cfread", PF_cfread, 105); // string (float desc) cfread
PR_AddBuiltin (&sv_pr_state, "cfwrite", PF_cfwrite, 106); // float (float desc, string buf) cfwrite
PR_AddBuiltin (&sv_pr_state, "cfeof", PF_cfeof, 107); // float (float desc) cfeof
PR_AddBuiltin (&sv_pr_state, "cfquota", PF_cfquota, 108); // float () cfquota
PR_AddBuiltin (&sv_pr_state, "SV_AllocClient", PF_SV_AllocClient, -1); // entity () SV_AllocClient // void (entity e, float chan, string samp) sound
PR_AddBuiltin (&sv_pr_state, "SV_FreeClient", PF_SV_FreeClient, -1); // void (entity cl) SV_FreeClient PR_AddBuiltin (&sv_pr_state, "sound", PF_sound, 8);
PR_AddBuiltin (&sv_pr_state, "SV_SetUserinfo", PF_SV_SetUserinfo, -1); // void (entity cl, string userinfo) SV_SetUserinfo
PR_AddBuiltin (&sv_pr_state, "SV_SetPing", PR_SV_SetPing, -1); // void (entity cl, integer ping) SV_SetPing // void (string e) error
PR_AddBuiltin (&sv_pr_state, "SV_UserCmd", PR_SV_UserCmd, -1); // void (entity cl, float secs, vector angles, vector move, integer buttons, integer impulse) SV_UserCmd PR_AddBuiltin (&sv_pr_state, "error", PF_error, 10);
// void (string e) objerror
PR_AddBuiltin (&sv_pr_state, "objerror", PF_objerror, 11);
// entity () spawn
PR_AddBuiltin (&sv_pr_state, "spawn", PF_Spawn, 14);
// void (entity e) remove
PR_AddBuiltin (&sv_pr_state, "remove", PF_Remove, 15);
// float (vector v1, vector v2, float tryents) traceline
PR_AddBuiltin (&sv_pr_state, "traceline", PF_traceline, 16);
// entity () clientlist
PR_AddBuiltin (&sv_pr_state, "checkclient", PF_checkclient, 17);
// void (string s) precache_sound
PR_AddBuiltin (&sv_pr_state, "precache_sound", PF_precache_sound, 19);
// void (string s) precache_model
PR_AddBuiltin (&sv_pr_state, "precache_model", PF_precache_model, 20);
// void (entity client, string s) stuffcmd
PR_AddBuiltin (&sv_pr_state, "stuffcmd", PF_stuffcmd, 21);
// entity (vector org, float rad) findradius
PR_AddBuiltin (&sv_pr_state, "findradius", PF_findradius, 22);
// void (string s) bprint
PR_AddBuiltin (&sv_pr_state, "bprint", PF_bprint, 23);
// void (entity client, string s) sprint
PR_AddBuiltin (&sv_pr_state, "sprint", PF_sprint, 24);
// float (float yaw, float dist) walkmove
PR_AddBuiltin (&sv_pr_state, "walkmove", PF_walkmove, 32);
// float () droptofloor
PR_AddBuiltin (&sv_pr_state, "droptofloor", PF_droptofloor, 34);
// void (float style, string value) lightstyle
PR_AddBuiltin (&sv_pr_state, "lightstyle", PF_lightstyle, 35);
// float (entity e) checkbottom
PR_AddBuiltin (&sv_pr_state, "checkbottom", PF_checkbottom, 40);
// float (vector v) pointcontents
PR_AddBuiltin (&sv_pr_state, "pointcontents", PF_pointcontents, 41);
// vector (entity e, float speed) aim
PR_AddBuiltin (&sv_pr_state, "aim", PF_aim, 44);
// void (string s) localcmd
PR_AddBuiltin (&sv_pr_state, "localcmd", PF_localcmd, 46);
// void () ChangeYaw
PR_AddBuiltin (&sv_pr_state, "changeyaw", PF_changeyaw, 49);
// void (float to, float f) WriteByte
PR_AddBuiltin (&sv_pr_state, "writebyte", PF_WriteByte, 52);
// void (float to, ...) WriteBytes
PR_AddBuiltin (&sv_pr_state, "WriteBytes", PF_WriteBytes, -1);
// void (float to, float f) WriteChar
PR_AddBuiltin (&sv_pr_state, "writechar", PF_WriteChar, 53);
// void (float to, float f) WriteShort
PR_AddBuiltin (&sv_pr_state, "writeshort", PF_WriteShort, 54);
// void (float to, float f) WriteLong
PR_AddBuiltin (&sv_pr_state, "writelong", PF_WriteLong, 55);
// void (float to, float f) WriteCoord
PR_AddBuiltin (&sv_pr_state, "writecoord", PF_WriteCoord, 56);
// void (float to, float f) WriteAngle
PR_AddBuiltin (&sv_pr_state, "writeangle", PF_WriteAngle, 57);
// void (float to, vector v) WriteCoordV
PR_AddBuiltin (&sv_pr_state, "WriteCoordV", PF_WriteCoordV, -1);
// void (float to, vector v) WriteAngleV
PR_AddBuiltin (&sv_pr_state, "WriteAngleV", PF_WriteAngleV, -1);
// void (float to, string s) WriteString
PR_AddBuiltin (&sv_pr_state, "writestring", PF_WriteString, 58);
// void (float to, entity s) WriteEntity
PR_AddBuiltin (&sv_pr_state, "writeentity", PF_WriteEntity, 59);
// void (float step) movetogoal
PR_AddBuiltin (&sv_pr_state, "movetogoal", SV_MoveToGoal, 67);
// string (string s) precache_file
PR_AddBuiltin (&sv_pr_state, "precache_file", PF_precache_file, 68);
// void (entity e) makestatic
PR_AddBuiltin (&sv_pr_state, "makestatic", PF_makestatic, 69);
// void (string s) changelevel
PR_AddBuiltin (&sv_pr_state, "changelevel", PF_changelevel, 70);
// void (...) centerprint
PR_AddBuiltin (&sv_pr_state, "centerprint", PF_centerprint, 73);
// void (vector pos, string samp, float vol, float atten) ambientsound
PR_AddBuiltin (&sv_pr_state, "ambientsound", PF_ambientsound, 74);
// string (string s) precache_model2
PR_AddBuiltin (&sv_pr_state, "precache_model2", PF_precache_model, 75);
// string (string s) precache_sound2
PR_AddBuiltin (&sv_pr_state, "precache_sound2", PF_precache_sound, 76);
// string (string s) precache_file2
PR_AddBuiltin (&sv_pr_state, "precache_file2", PF_precache_file, 77);
// void (entity e) setspawnparms
PR_AddBuiltin (&sv_pr_state, "setspawnparms", PF_setspawnparms, 78);
// void (entity killer, entity killee) logfrag
PR_AddBuiltin (&sv_pr_state, "logfrag", PF_logfrag, 79);
// string (entity e, string key) infokey
PR_AddBuiltin (&sv_pr_state, "infokey", PF_infokey, 80);
// void (vector where, float set) multicast
PR_AddBuiltin (&sv_pr_state, "multicast", PF_multicast, 82);
// entity (entity ent) testentitypos
PR_AddBuiltin (&sv_pr_state, "testentitypos", PF_testentitypos, 92);
// integer (entity ent, vector point) hullpointcontents
PR_AddBuiltin (&sv_pr_state, "hullpointcontents", PF_hullpointcontents,
93);
// vector (integer hull, integer max) getboxbounds
PR_AddBuiltin (&sv_pr_state, "getboxbounds", PF_getboxbounds, 94);
// integer () getboxhull
PR_AddBuiltin (&sv_pr_state, "getboxhull", PF_getboxhull, 95);
// void (integer hull) freeboxhull
PR_AddBuiltin (&sv_pr_state, "freeboxhull", PF_freeboxhull, 96);
// void (integer hull, vector right, vector forward, vector up, vector mins, vector maxs) rotate_bbox
PR_AddBuiltin (&sv_pr_state, "rotate_bbox", PF_rotate_bbox, 97);
// void (vector start, vector mins, vector maxs, vector end, float type, entity passent) checkmove
PR_AddBuiltin (&sv_pr_state, "checkmove", PF_checkmove, 98);
// float () checkextension
PR_AddBuiltin (&sv_pr_state, "checkextension", PF_checkextension, 99);
// void (entity ent, string key, string value) setinfokey
PR_AddBuiltin (&sv_pr_state, "setinfokey", PF_setinfokey, 102);
// float (string path, string mode) cfopen
PR_AddBuiltin (&sv_pr_state, "cfopen", PF_cfopen, 103);
// void (float desc) cfclose
PR_AddBuiltin (&sv_pr_state, "cfclose", PF_cfclose, 104);
// string (float desc) cfread
PR_AddBuiltin (&sv_pr_state, "cfread", PF_cfread, 105);
// float (float desc, string buf) cfwrite
PR_AddBuiltin (&sv_pr_state, "cfwrite", PF_cfwrite, 106);
// float (float desc) cfeof
PR_AddBuiltin (&sv_pr_state, "cfeof", PF_cfeof, 107);
// float () cfquota
PR_AddBuiltin (&sv_pr_state, "cfquota", PF_cfquota, 108);
// entity () SV_AllocClient
PR_AddBuiltin (&sv_pr_state, "SV_AllocClient", PF_SV_AllocClient, -1);
// void (entity cl) SV_FreeClient
PR_AddBuiltin (&sv_pr_state, "SV_FreeClient", PF_SV_FreeClient, -1);
// void (entity cl, string userinfo) SV_SetUserinfo
PR_AddBuiltin (&sv_pr_state, "SV_SetUserinfo", PF_SV_SetUserinfo, -1);
// void (entity cl, integer ping) SV_SetPing
PR_AddBuiltin (&sv_pr_state, "SV_SetPing", PR_SV_SetPing, -1);
// void (entity cl, float secs, vector angles, vector move, integer buttons, integer impulse) SV_UserCmd
PR_AddBuiltin (&sv_pr_state, "SV_UserCmd", PR_SV_UserCmd, -1);
}; };