X-Git-Url: https://de.git.xonotic.org/?a=blobdiff_plain;f=pr_cmds.c;h=85dbfcefeb89764606357c481959f234dd5f0d8c;hb=668a437d46dfad040c8e32398fd7cb916345f7d1;hp=4d312c73172c7d38450c88beb89cd9ff4bfcda1a;hpb=f9605292b17719532eac0b3c7ccd6341b671d684;p=xonotic%2Fdarkplaces.git diff --git a/pr_cmds.c b/pr_cmds.c index 4d312c73..85dbfcef 100644 --- a/pr_cmds.c +++ b/pr_cmds.c @@ -8,7 +8,7 @@ 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. +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. @@ -20,6 +20,8 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #include "quakedef.h" +cvar_t sv_aim = {CVAR_SAVE, "sv_aim", "2"}; //"0.93"}; // LordHavoc: disabled autoaim by default + #define RETURN_EDICT(e) (((int *)pr_globals)[OFS_RETURN] = EDICT_TO_PROG(e)) @@ -36,7 +38,7 @@ char *PF_VarString (int first) { int i; static char out[256]; - + out[0] = 0; for (i=first ; iself); ED_Print (ed); ED_Free (ed); - -// LordHavoc: bug fix - no longer kills server -// Host_Error ("Program error"); } - /* ============== PF_makevectors @@ -222,80 +221,12 @@ void PF_setorigin (void) void SetMinMaxSize (edict_t *e, float *min, float *max, qboolean rotate) { - /* - float *angles; - vec3_t rmin, rmax; - float bounds[2][3]; - float xvector[2], yvector[2]; - float a; - vec3_t base, transformed; - int i, j, k, l; - */ int i; for (i=0 ; i<3 ; i++) if (min[i] > max[i]) PR_RunError ("backwards mins/maxs"); - /* - rotate = false; // FIXME: implement rotation properly again - - if (!rotate) - { - VectorCopy (min, rmin); - VectorCopy (max, rmax); - } - else - { - // find min / max for rotations - angles = e->v.angles; - - a = angles[1]/180 * M_PI; - - xvector[0] = cos(a); - xvector[1] = sin(a); - yvector[0] = -sin(a); - yvector[1] = cos(a); - - VectorCopy (min, bounds[0]); - VectorCopy (max, bounds[1]); - - rmin[0] = rmin[1] = rmin[2] = 9999; - rmax[0] = rmax[1] = rmax[2] = -9999; - - for (i=0 ; i<= 1 ; i++) - { - base[0] = bounds[i][0]; - for (j=0 ; j<= 1 ; j++) - { - base[1] = bounds[j][1]; - for (k=0 ; k<= 1 ; k++) - { - base[2] = bounds[k][2]; - - // transform the point - transformed[0] = xvector[0]*base[0] + yvector[0]*base[1]; - transformed[1] = xvector[1]*base[0] + yvector[1]*base[1]; - transformed[2] = base[2]; - - for (l=0 ; l<3 ; l++) - { - if (transformed[l] < rmin[l]) - rmin[l] = transformed[l]; - if (transformed[l] > rmax[l]) - rmax[l] = transformed[l]; - } - } - } - } - } - -// set derived values - VectorCopy (rmin, e->v.mins); - VectorCopy (rmax, e->v.maxs); - VectorSubtract (max, min, e->v.size); - */ - // set derived values VectorCopy (min, e->v.mins); VectorCopy (max, e->v.maxs); @@ -347,31 +278,18 @@ void PF_setmodel (void) for (i=0, check = sv.model_precache ; *check ; i++, check++) if (!strcmp(*check, m)) break; - + if (!*check) PR_RunError ("no precache: %s\n", m); - + e->v.model = m - pr_strings; - e->v.modelindex = i; //SV_ModelIndex (m); + e->v.modelindex = i; + + mod = sv.models[ (int)e->v.modelindex]; - mod = sv.models[ (int)e->v.modelindex]; // Mod_ForName (m, true); - if (mod) - /* - { // LordHavoc: corrected model bounding box, but for compatibility that means I have to break it here - vec3_t min, max; - if (mod->type == ALIASTYPE_MDL) - { - min[0] = min[1] = min[2] = -16; - max[0] = max[1] = max[2] = 16; - SetMinMaxSize (e, min, max, true); - } - else - SetMinMaxSize (e, mod->mins, mod->maxs, true); - } - */ - SetMinMaxSize (e, mod->mins, mod->maxs, true); + SetMinMaxSize (e, mod->normalmins, mod->normalmaxs, true); else SetMinMaxSize (e, vec3_origin, vec3_origin, true); } @@ -497,7 +415,7 @@ void PF_vlen (void) { float *value1; float new; - + value1 = G_VECTOR(OFS_PARM0); new = value1[0] * value1[0] + value1[1] * value1[1] + value1[2]*value1[2]; @@ -632,7 +550,7 @@ void PF_ambientsound (void) char *samp; float *pos; float vol, attenuation; - int i, soundnum; + int i, soundnum, large; pos = G_VECTOR (OFS_PARM0); samp = G_STRING(OFS_PARM1); @@ -643,20 +561,31 @@ void PF_ambientsound (void) for (soundnum=0, check = sv.sound_precache ; *check ; check++, soundnum++) if (!strcmp(*check,samp)) break; - + if (!*check) { Con_Printf ("no precache: %s\n", samp); return; } -// add an svc_spawnambient command to the level signon packet + large = false; + if (soundnum >= 256) + large = true; + + // add an svc_spawnambient command to the level signon packet + + if (large) + MSG_WriteByte (&sv.signon, svc_spawnstaticsound2); + else + MSG_WriteByte (&sv.signon, svc_spawnstaticsound); - MSG_WriteByte (&sv.signon,svc_spawnstaticsound); for (i=0 ; i<3 ; i++) - MSG_WriteFloatCoord(&sv.signon, pos[i]); + MSG_WriteDPCoord(&sv.signon, pos[i]); - MSG_WriteByte (&sv.signon, soundnum); + if (large) + MSG_WriteShort (&sv.signon, soundnum); + else + MSG_WriteByte (&sv.signon, soundnum); MSG_WriteByte (&sv.signon, vol*255); MSG_WriteByte (&sv.signon, attenuation*64); @@ -713,8 +642,6 @@ break() */ void PF_break (void) { -// Con_Printf ("break statement\n"); -// *(int *)-4 = 0; // dump to debugger PR_RunError ("break statement"); } @@ -741,7 +668,7 @@ void PF_traceline (void) nomonsters = G_FLOAT(OFS_PARM2); ent = G_EDICT(OFS_PARM3); - trace = SV_Move (v1, vec3_origin, vec3_origin, v2, nomonsters, ent); + trace = SV_Move (v1, vec3_origin, vec3_origin, v2, nomonsters ? MOVE_NOMONSTERS : MOVE_NORMAL, ent); pr_global_struct->trace_allsolid = trace.allsolid; pr_global_struct->trace_startsolid = trace.startsolid; @@ -750,11 +677,12 @@ void PF_traceline (void) pr_global_struct->trace_inopen = trace.inopen; VectorCopy (trace.endpos, pr_global_struct->trace_endpos); VectorCopy (trace.plane.normal, pr_global_struct->trace_plane_normal); - pr_global_struct->trace_plane_dist = trace.plane.dist; + pr_global_struct->trace_plane_dist = trace.plane.dist; if (trace.ent) pr_global_struct->trace_ent = EDICT_TO_PROG(trace.ent); else pr_global_struct->trace_ent = EDICT_TO_PROG(sv.edicts); + // FIXME: add trace_endcontents } @@ -784,7 +712,7 @@ void PF_tracebox (void) nomonsters = G_FLOAT(OFS_PARM4); ent = G_EDICT(OFS_PARM5); - trace = SV_Move (v1, m1, m2, v2, nomonsters, ent); + trace = SV_Move (v1, m1, m2, v2, nomonsters ? MOVE_NOMONSTERS : MOVE_NORMAL, ent); pr_global_struct->trace_allsolid = trace.allsolid; pr_global_struct->trace_startsolid = trace.startsolid; @@ -843,12 +771,12 @@ void PF_checkpos (void) //============================================================================ -byte checkpvs[MAX_MAP_LEAFS/8]; +qbyte checkpvs[MAX_MAP_LEAFS/8]; int PF_newcheckclient (int check) { int i; - byte *pvs; + qbyte *pvs; edict_t *ent; mleaf_t *leaf; vec3_t org; @@ -991,7 +919,7 @@ localcmd (string) void PF_localcmd (void) { char *str; - + str = G_STRING(OFS_PARM0); Cbuf_AddText (str); } @@ -1040,16 +968,18 @@ findradius (origin, radius) */ void PF_findradius (void) { - edict_t *ent, *chain; - float rad; - float *org; - vec3_t eorg; - int i, j; + edict_t *ent, *chain; + float radius; + float radius2; + float *org; + float eorg[3]; + int i; chain = (edict_t *)sv.edicts; org = G_VECTOR(OFS_PARM0); - rad = G_FLOAT(OFS_PARM1); + radius = G_FLOAT(OFS_PARM1); + radius2 = radius * radius; ent = NEXT_EDICT(sv.edicts); for (i=1 ; iv.solid == SOLID_NOT) continue; - for (j=0 ; j<3 ; j++) - eorg[j] = org[j] - (ent->v.origin[j] + (ent->v.mins[j] + ent->v.maxs[j])*0.5); - if (Length(eorg) > rad) + + // LordHavoc: compare against bounding box rather than center, + // and use DotProduct instead of Length, major speedup + eorg[0] = (org[0] - ent->v.origin[0]) - bound(ent->v.mins[0], (org[0] - ent->v.origin[0]), ent->v.maxs[0]); + eorg[1] = (org[1] - ent->v.origin[1]) - bound(ent->v.mins[1], (org[1] - ent->v.origin[1]), ent->v.maxs[1]); + eorg[2] = (org[2] - ent->v.origin[2]) - bound(ent->v.mins[2], (org[2] - ent->v.origin[2]), ent->v.maxs[2]); + if (DotProduct(eorg, eorg) > radius2) continue; ent->v.chain = EDICT_TO_PROG(chain); @@ -1081,22 +1015,30 @@ void PF_dprint (void) Con_DPrintf ("%s",PF_VarString(0)); } -char pr_string_temp[128]; +// LordHavoc: added this to semi-fix the problem of using many ftos calls in a print +#define STRINGTEMP_BUFFERS 16 +#define STRINGTEMP_LENGTH 128 +static char pr_string_temp[STRINGTEMP_BUFFERS][STRINGTEMP_LENGTH]; +static int pr_string_tempindex = 0; + +static char *PR_GetTempString(void) +{ + char *s; + s = pr_string_temp[pr_string_tempindex]; + pr_string_tempindex = (pr_string_tempindex + 1) % STRINGTEMP_BUFFERS; + return s; +} void PF_ftos (void) { - float v; + float v; + char *s; v = G_FLOAT(OFS_PARM0); + s = PR_GetTempString(); // LordHavoc: ftos improvement - sprintf (pr_string_temp, "%g", v); - /* - if (v == (int)v) - sprintf (pr_string_temp, "%d",(int)v); - else - sprintf (pr_string_temp, "%5.1f",v); - */ - G_INT(OFS_RETURN) = pr_string_temp - pr_strings; + sprintf (s, "%g", v); + G_INT(OFS_RETURN) = s - pr_strings; } void PF_fabs (void) @@ -1108,14 +1050,18 @@ void PF_fabs (void) void PF_vtos (void) { - sprintf (pr_string_temp, "'%5.1f %5.1f %5.1f'", G_VECTOR(OFS_PARM0)[0], G_VECTOR(OFS_PARM0)[1], G_VECTOR(OFS_PARM0)[2]); - G_INT(OFS_RETURN) = pr_string_temp - pr_strings; + char *s; + s = PR_GetTempString(); + sprintf (s, "'%5.1f %5.1f %5.1f'", G_VECTOR(OFS_PARM0)[0], G_VECTOR(OFS_PARM0)[1], G_VECTOR(OFS_PARM0)[2]); + G_INT(OFS_RETURN) = s - pr_strings; } void PF_etos (void) { - sprintf (pr_string_temp, "entity %i", G_EDICTNUM(OFS_PARM0)); - G_INT(OFS_RETURN) = pr_string_temp - pr_strings; + char *s; + s = PR_GetTempString(); + sprintf (s, "entity %i", G_EDICTNUM(OFS_PARM0)); + G_INT(OFS_RETURN) = s - pr_strings; } void PF_Spawn (void) @@ -1128,8 +1074,12 @@ void PF_Spawn (void) void PF_Remove (void) { edict_t *ed; - + ed = G_EDICT(OFS_PARM0); + if (ed == sv.edicts) + PR_RunError("remove: tried to remove world\n"); + if (NUM_FOR_EDICT(ed) <= svs.maxclients) + PR_RunError("remove: tried to remove a client\n"); ED_Free (ed); } @@ -1137,7 +1087,7 @@ void PF_Remove (void) // entity (entity start, .string field, string match) find = #5; void PF_Find (void) { - int e; + int e; int f; char *s, *t; edict_t *ed; @@ -1150,7 +1100,7 @@ void PF_Find (void) RETURN_EDICT(sv.edicts); return; } - + for (e++ ; e < sv.num_edicts ; e++) { ed = EDICT_NUM(e); @@ -1277,10 +1227,10 @@ void PF_precache_sound (void) { char *s; int i; - + if (sv.state != ss_loading) PR_RunError ("PF_Precache_*: Precache can only be done in spawn functions"); - + s = G_STRING(OFS_PARM0); G_INT(OFS_RETURN) = G_INT(OFS_PARM0); PR_CheckEmptyString (s); @@ -1298,7 +1248,6 @@ void PF_precache_sound (void) PR_RunError ("PF_precache_sound: overflow"); } -extern qboolean hlbsp; void PF_precache_model (void) { char *s; @@ -1306,9 +1255,9 @@ void PF_precache_model (void) if (sv.state != ss_loading) PR_RunError ("PF_Precache_*: Precache can only be done in spawn functions"); - + s = G_STRING(OFS_PARM0); - if (hlbsp && ((!s) || (!s[0]))) + if (sv.worldmodel->ishlbsp && ((!s) || (!s[0]))) return; G_INT(OFS_RETURN) = G_INT(OFS_PARM0); PR_CheckEmptyString (s); @@ -1318,7 +1267,7 @@ void PF_precache_model (void) if (!sv.model_precache[i]) { sv.model_precache[i] = s; - sv.models[i] = Mod_ForName (s, true); + sv.models[i] = Mod_ForName (s, true, false, false); return; } if (!strcmp(sv.model_precache[i], s)) @@ -1403,13 +1352,13 @@ void PF_droptofloor (void) edict_t *ent; vec3_t end; trace_t trace; - + ent = PROG_TO_EDICT(pr_global_struct->self); VectorCopy (ent->v.origin, end); end[2] -= 256; - - trace = SV_Move (ent->v.origin, ent->v.mins, ent->v.maxs, end, false, ent); + + trace = SV_Move (ent->v.origin, ent->v.mins, ent->v.maxs, end, MOVE_NORMAL, ent); if (trace.fraction == 1 || trace.allsolid) G_FLOAT(OFS_RETURN) = 0; @@ -1420,6 +1369,8 @@ void PF_droptofloor (void) ent->v.flags = (int)ent->v.flags | FL_ONGROUND; ent->v.groundentity = EDICT_TO_PROG(trace.ent); G_FLOAT(OFS_RETURN) = 1; + // if support is destroyed, keep suspended (gross hack for floating items in various maps) + ent->suspendedinairflag = true; } } @@ -1436,17 +1387,17 @@ void PF_lightstyle (void) char *val; client_t *client; int j; - + style = G_FLOAT(OFS_PARM0); val = G_STRING(OFS_PARM1); // change the string in sv sv.lightstyles[style] = val; - + // send message to all clients on this server if (sv.state != ss_active) return; - + for (j=0, client = svs.clients ; jactive || client->spawned) { @@ -1492,7 +1443,7 @@ PF_pointcontents */ void PF_pointcontents (void) { - G_FLOAT(OFS_RETURN) = SV_PointContents (G_VECTOR(OFS_PARM0)); + G_FLOAT(OFS_RETURN) = Mod_PointInLeaf(G_VECTOR(OFS_PARM0), sv.worldmodel)->contents; } /* @@ -1506,7 +1457,7 @@ void PF_nextent (void) { int i; edict_t *ent; - + i = G_EDICTNUM(OFS_PARM0); while (1) { @@ -1533,7 +1484,6 @@ Pick a vector for the player to shoot along vector aim(entity, missilespeed) ============= */ -cvar_t sv_aim = {"sv_aim", "0.93"}; void PF_aim (void) { edict_t *ent, *check, *bestent; @@ -1542,7 +1492,7 @@ void PF_aim (void) trace_t tr; float dist, bestdist; float speed; - + ent = G_EDICT(OFS_PARM0); speed = G_FLOAT(OFS_PARM1); @@ -1552,9 +1502,9 @@ void PF_aim (void) // try sending a trace straight VectorCopy (pr_global_struct->v_forward, dir); VectorMA (start, 2048, dir, end); - tr = SV_Move (start, vec3_origin, vec3_origin, end, false, ent); - if (tr.ent && tr.ent->v.takedamage == DAMAGE_AIM - && (!teamplay.value || ent->v.team <=0 || ent->v.team != tr.ent->v.team) ) + tr = SV_Move (start, vec3_origin, vec3_origin, end, MOVE_NORMAL, ent); + if (tr.ent && ((edict_t *)tr.ent)->v.takedamage == DAMAGE_AIM + && (!teamplay.integer || ent->v.team <=0 || ent->v.team != ((edict_t *)tr.ent)->v.team) ) { VectorCopy (pr_global_struct->v_forward, G_VECTOR(OFS_RETURN)); return; @@ -1565,7 +1515,7 @@ void PF_aim (void) VectorCopy (dir, bestdir); bestdist = sv_aim.value; bestent = NULL; - + check = NEXT_EDICT(sv.edicts); for (i=1 ; iv.team > 0 && ent->v.team == check->v.team) + if (teamplay.integer && ent->v.team > 0 && ent->v.team == check->v.team) continue; // don't aim at teammate for (j=0 ; j<3 ; j++) end[j] = check->v.origin[j] @@ -1583,14 +1533,14 @@ void PF_aim (void) dist = DotProduct (dir, pr_global_struct->v_forward); if (dist < bestdist) continue; // to far to turn - tr = SV_Move (start, vec3_origin, vec3_origin, end, false, ent); + tr = SV_Move (start, vec3_origin, vec3_origin, end, MOVE_NORMAL, ent); if (tr.ent == check) { // can shoot at this one bestdist = dist; bestent = check; } } - + if (bestent) { VectorSubtract (bestent->v.origin, ent->v.origin, dir); @@ -1598,7 +1548,7 @@ void PF_aim (void) VectorScale (pr_global_struct->v_forward, dist, end); end[2] = dir[2]; VectorNormalize (end); - VectorCopy (end, G_VECTOR(OFS_RETURN)); + VectorCopy (end, G_VECTOR(OFS_RETURN)); } else { @@ -1617,12 +1567,12 @@ void PF_changeyaw (void) { edict_t *ent; float ideal, current, move, speed; - + ent = PROG_TO_EDICT(pr_global_struct->self); current = ANGLEMOD(ent->v.angles[1]); ideal = ent->v.ideal_yaw; speed = ent->v.yaw_speed; - + if (current == ideal) return; move = ideal - current; @@ -1646,7 +1596,7 @@ void PF_changeyaw (void) if (move < -speed) move = -speed; } - + ent->v.angles[1] = ANGLEMOD (current + move); } @@ -1660,7 +1610,7 @@ void PF_changepitch (void) edict_t *ent; float ideal, current, move, speed; eval_t *val; - + ent = G_EDICT(OFS_PARM0); current = ANGLEMOD( ent->v.angles[0] ); if ((val = GETEDICTFIELDVALUE(ent, eval_idealpitch))) @@ -1677,7 +1627,7 @@ void PF_changepitch (void) PR_RunError ("PF_changepitch: .float idealpitch and .float pitch_speed must be defined to use changepitch"); return; } - + if (current == ideal) return; move = ideal - current; @@ -1701,7 +1651,7 @@ void PF_changepitch (void) if (move < -speed) move = -speed; } - + ent->v.angles[0] = ANGLEMOD (current + move); } @@ -1729,17 +1679,17 @@ sizebuf_t *WriteDest (void) { case MSG_BROADCAST: return &sv.datagram; - + case MSG_ONE: ent = PROG_TO_EDICT(pr_global_struct->msg_entity); entnum = NUM_FOR_EDICT(ent); if (entnum < 1 || entnum > svs.maxclients) PR_RunError ("WriteDest: not a client"); return &svs.clients[entnum-1].message; - + case MSG_ALL: return &sv.reliable_datagram; - + case MSG_INIT: return &sv.signon; @@ -1747,7 +1697,7 @@ sizebuf_t *WriteDest (void) PR_RunError ("WriteDest: bad destination"); break; } - + return NULL; } @@ -1778,7 +1728,7 @@ void PF_WriteAngle (void) void PF_WriteCoord (void) { - MSG_WriteFloatCoord (WriteDest(), G_FLOAT(OFS_PARM1)); + MSG_WriteDPCoord (WriteDest(), G_FLOAT(OFS_PARM1)); } void PF_WriteString (void) @@ -1799,28 +1749,32 @@ int SV_ModelIndex (char *name); void PF_makestatic (void) { edict_t *ent; - int i; - + int i, large; + ent = G_EDICT(OFS_PARM0); - i = SV_ModelIndex(pr_strings + ent->v.model); - if (i >= 256) + large = false; + if (ent->v.modelindex >= 256 || ent->v.frame >= 256) + large = true; + + if (large) { MSG_WriteByte (&sv.signon,svc_spawnstatic2); - MSG_WriteShort (&sv.signon, i); + MSG_WriteShort (&sv.signon, ent->v.modelindex); + MSG_WriteShort (&sv.signon, ent->v.frame); } else { MSG_WriteByte (&sv.signon,svc_spawnstatic); - MSG_WriteByte (&sv.signon, i); + MSG_WriteByte (&sv.signon, ent->v.modelindex); + MSG_WriteByte (&sv.signon, ent->v.frame); } - MSG_WriteByte (&sv.signon, ent->v.frame); MSG_WriteByte (&sv.signon, ent->v.colormap); MSG_WriteByte (&sv.signon, ent->v.skin); for (i=0 ; i<3 ; i++) { - MSG_WriteFloatCoord(&sv.signon, ent->v.origin[i]); + MSG_WriteDPCoord(&sv.signon, ent->v.origin[i]); MSG_WriteAngle(&sv.signon, ent->v.angles[i]); } @@ -1866,7 +1820,7 @@ void PF_changelevel (void) if (svs.changelevel_issued) return; svs.changelevel_issued = true; - + s = G_STRING(OFS_PARM0); Cbuf_AddText (va("changelevel %s\n",s)); } @@ -1905,7 +1859,7 @@ void PF_randomvec (void) temp[2] = (rand()&32767) * (2.0 / 32767.0) - 1.0; } while (DotProduct(temp, temp) >= 1); - VectorCopy (temp, G_VECTOR(OFS_RETURN)); + VectorCopy (temp, G_VECTOR(OFS_RETURN)); } void SV_LightPoint (vec3_t color, vec3_t p); @@ -1927,7 +1881,7 @@ void PF_GetLight (void) vec_t* p; p = G_VECTOR(OFS_PARM0); SV_LightPoint (color, p); - VectorCopy (color, G_VECTOR(OFS_RETURN)); + VectorCopy (color, G_VECTOR(OFS_RETURN)); } #define MAX_QC_CVARS 128 @@ -1938,13 +1892,13 @@ void PF_registercvar (void) { char *name, *value; cvar_t *variable; - name = G_STRING(OFS_PARM1); - value = G_STRING(OFS_PARM2); + name = G_STRING(OFS_PARM0); + value = G_STRING(OFS_PARM1); G_FLOAT(OFS_RETURN) = 0; // first check to see if it has already been defined if (Cvar_FindVar (name)) return; - + // check for overlap with a command if (Cmd_Exists (name)) { @@ -1957,12 +1911,12 @@ void PF_registercvar (void) // copy the name and value variable = &qc_cvar[currentqc_cvar++]; - variable->name = Z_Malloc (strlen(name)+1); + variable->name = Z_Malloc (strlen(name)+1); strcpy (variable->name, name); - variable->string = Z_Malloc (strlen(value)+1); + variable->string = Z_Malloc (strlen(value)+1); strcpy (variable->string, value); variable->value = atof (value); - + // link the variable in variable->next = cvar_vars; cvar_vars = variable; @@ -2081,20 +2035,20 @@ void PF_setcolor (void) { client_t *client; int entnum, i; - + entnum = G_EDICTNUM(OFS_PARM0); i = G_FLOAT(OFS_PARM1); - + if (entnum < 1 || entnum > svs.maxclients) { Con_Printf ("tried to setcolor a non-client\n"); return; } - + client = &svs.clients[entnum-1]; client->colors = i; client->edict->v.team = (i & 15) + 1; - + MSG_WriteByte (&sv.reliable_datagram, svc_updatecolors); MSG_WriteByte (&sv.reliable_datagram, entnum - 1); MSG_WriteByte (&sv.reliable_datagram, i); @@ -2124,9 +2078,9 @@ void PF_te_blood (void) MSG_WriteByte(&sv.datagram, svc_temp_entity); MSG_WriteByte(&sv.datagram, TE_BLOOD); // origin - MSG_WriteFloatCoord(&sv.datagram, G_VECTOR(OFS_PARM0)[0]); - MSG_WriteFloatCoord(&sv.datagram, G_VECTOR(OFS_PARM0)[1]); - MSG_WriteFloatCoord(&sv.datagram, G_VECTOR(OFS_PARM0)[2]); + MSG_WriteDPCoord(&sv.datagram, G_VECTOR(OFS_PARM0)[0]); + MSG_WriteDPCoord(&sv.datagram, G_VECTOR(OFS_PARM0)[1]); + MSG_WriteDPCoord(&sv.datagram, G_VECTOR(OFS_PARM0)[2]); // velocity MSG_WriteByte(&sv.datagram, bound(-128, (int) G_VECTOR(OFS_PARM1)[0], 127)); MSG_WriteByte(&sv.datagram, bound(-128, (int) G_VECTOR(OFS_PARM1)[1], 127)); @@ -2142,15 +2096,15 @@ void PF_te_bloodshower (void) MSG_WriteByte(&sv.datagram, svc_temp_entity); MSG_WriteByte(&sv.datagram, TE_BLOODSHOWER); // min - MSG_WriteFloatCoord(&sv.datagram, G_VECTOR(OFS_PARM0)[0]); - MSG_WriteFloatCoord(&sv.datagram, G_VECTOR(OFS_PARM0)[1]); - MSG_WriteFloatCoord(&sv.datagram, G_VECTOR(OFS_PARM0)[2]); + MSG_WriteDPCoord(&sv.datagram, G_VECTOR(OFS_PARM0)[0]); + MSG_WriteDPCoord(&sv.datagram, G_VECTOR(OFS_PARM0)[1]); + MSG_WriteDPCoord(&sv.datagram, G_VECTOR(OFS_PARM0)[2]); // max - MSG_WriteFloatCoord(&sv.datagram, G_VECTOR(OFS_PARM1)[0]); - MSG_WriteFloatCoord(&sv.datagram, G_VECTOR(OFS_PARM1)[1]); - MSG_WriteFloatCoord(&sv.datagram, G_VECTOR(OFS_PARM1)[2]); + MSG_WriteDPCoord(&sv.datagram, G_VECTOR(OFS_PARM1)[0]); + MSG_WriteDPCoord(&sv.datagram, G_VECTOR(OFS_PARM1)[1]); + MSG_WriteDPCoord(&sv.datagram, G_VECTOR(OFS_PARM1)[2]); // speed - MSG_WriteFloatCoord(&sv.datagram, G_FLOAT(OFS_PARM2)); + MSG_WriteDPCoord(&sv.datagram, G_FLOAT(OFS_PARM2)); // count MSG_WriteShort(&sv.datagram, bound(0, G_FLOAT(OFS_PARM3), 65535)); } @@ -2160,9 +2114,9 @@ void PF_te_explosionrgb (void) MSG_WriteByte(&sv.datagram, svc_temp_entity); MSG_WriteByte(&sv.datagram, TE_EXPLOSIONRGB); // origin - MSG_WriteFloatCoord(&sv.datagram, G_VECTOR(OFS_PARM0)[0]); - MSG_WriteFloatCoord(&sv.datagram, G_VECTOR(OFS_PARM0)[1]); - MSG_WriteFloatCoord(&sv.datagram, G_VECTOR(OFS_PARM0)[2]); + MSG_WriteDPCoord(&sv.datagram, G_VECTOR(OFS_PARM0)[0]); + MSG_WriteDPCoord(&sv.datagram, G_VECTOR(OFS_PARM0)[1]); + MSG_WriteDPCoord(&sv.datagram, G_VECTOR(OFS_PARM0)[2]); // color MSG_WriteByte(&sv.datagram, bound(0, (int) (G_VECTOR(OFS_PARM1)[0] * 255), 255)); MSG_WriteByte(&sv.datagram, bound(0, (int) (G_VECTOR(OFS_PARM1)[1] * 255), 255)); @@ -2176,17 +2130,17 @@ void PF_te_particlecube (void) MSG_WriteByte(&sv.datagram, svc_temp_entity); MSG_WriteByte(&sv.datagram, TE_PARTICLECUBE); // min - MSG_WriteFloatCoord(&sv.datagram, G_VECTOR(OFS_PARM0)[0]); - MSG_WriteFloatCoord(&sv.datagram, G_VECTOR(OFS_PARM0)[1]); - MSG_WriteFloatCoord(&sv.datagram, G_VECTOR(OFS_PARM0)[2]); + MSG_WriteDPCoord(&sv.datagram, G_VECTOR(OFS_PARM0)[0]); + MSG_WriteDPCoord(&sv.datagram, G_VECTOR(OFS_PARM0)[1]); + MSG_WriteDPCoord(&sv.datagram, G_VECTOR(OFS_PARM0)[2]); // max - MSG_WriteFloatCoord(&sv.datagram, G_VECTOR(OFS_PARM1)[0]); - MSG_WriteFloatCoord(&sv.datagram, G_VECTOR(OFS_PARM1)[1]); - MSG_WriteFloatCoord(&sv.datagram, G_VECTOR(OFS_PARM1)[2]); + MSG_WriteDPCoord(&sv.datagram, G_VECTOR(OFS_PARM1)[0]); + MSG_WriteDPCoord(&sv.datagram, G_VECTOR(OFS_PARM1)[1]); + MSG_WriteDPCoord(&sv.datagram, G_VECTOR(OFS_PARM1)[2]); // velocity - MSG_WriteFloatCoord(&sv.datagram, G_VECTOR(OFS_PARM2)[0]); - MSG_WriteFloatCoord(&sv.datagram, G_VECTOR(OFS_PARM2)[1]); - MSG_WriteFloatCoord(&sv.datagram, G_VECTOR(OFS_PARM2)[2]); + MSG_WriteDPCoord(&sv.datagram, G_VECTOR(OFS_PARM2)[0]); + MSG_WriteDPCoord(&sv.datagram, G_VECTOR(OFS_PARM2)[1]); + MSG_WriteDPCoord(&sv.datagram, G_VECTOR(OFS_PARM2)[2]); // count MSG_WriteShort(&sv.datagram, bound(0, G_FLOAT(OFS_PARM3), 65535)); // color @@ -2194,7 +2148,7 @@ void PF_te_particlecube (void) // gravity true/false MSG_WriteByte(&sv.datagram, ((int) G_FLOAT(OFS_PARM5)) != 0); // randomvel - MSG_WriteFloatCoord(&sv.datagram, G_FLOAT(OFS_PARM6)); + MSG_WriteDPCoord(&sv.datagram, G_FLOAT(OFS_PARM6)); } void PF_te_particlerain (void) @@ -2204,17 +2158,17 @@ void PF_te_particlerain (void) MSG_WriteByte(&sv.datagram, svc_temp_entity); MSG_WriteByte(&sv.datagram, TE_PARTICLERAIN); // min - MSG_WriteFloatCoord(&sv.datagram, G_VECTOR(OFS_PARM0)[0]); - MSG_WriteFloatCoord(&sv.datagram, G_VECTOR(OFS_PARM0)[1]); - MSG_WriteFloatCoord(&sv.datagram, G_VECTOR(OFS_PARM0)[2]); + MSG_WriteDPCoord(&sv.datagram, G_VECTOR(OFS_PARM0)[0]); + MSG_WriteDPCoord(&sv.datagram, G_VECTOR(OFS_PARM0)[1]); + MSG_WriteDPCoord(&sv.datagram, G_VECTOR(OFS_PARM0)[2]); // max - MSG_WriteFloatCoord(&sv.datagram, G_VECTOR(OFS_PARM1)[0]); - MSG_WriteFloatCoord(&sv.datagram, G_VECTOR(OFS_PARM1)[1]); - MSG_WriteFloatCoord(&sv.datagram, G_VECTOR(OFS_PARM1)[2]); + MSG_WriteDPCoord(&sv.datagram, G_VECTOR(OFS_PARM1)[0]); + MSG_WriteDPCoord(&sv.datagram, G_VECTOR(OFS_PARM1)[1]); + MSG_WriteDPCoord(&sv.datagram, G_VECTOR(OFS_PARM1)[2]); // velocity - MSG_WriteFloatCoord(&sv.datagram, G_VECTOR(OFS_PARM2)[0]); - MSG_WriteFloatCoord(&sv.datagram, G_VECTOR(OFS_PARM2)[1]); - MSG_WriteFloatCoord(&sv.datagram, G_VECTOR(OFS_PARM2)[2]); + MSG_WriteDPCoord(&sv.datagram, G_VECTOR(OFS_PARM2)[0]); + MSG_WriteDPCoord(&sv.datagram, G_VECTOR(OFS_PARM2)[1]); + MSG_WriteDPCoord(&sv.datagram, G_VECTOR(OFS_PARM2)[2]); // count MSG_WriteShort(&sv.datagram, bound(0, G_FLOAT(OFS_PARM3), 65535)); // color @@ -2228,17 +2182,17 @@ void PF_te_particlesnow (void) MSG_WriteByte(&sv.datagram, svc_temp_entity); MSG_WriteByte(&sv.datagram, TE_PARTICLESNOW); // min - MSG_WriteFloatCoord(&sv.datagram, G_VECTOR(OFS_PARM0)[0]); - MSG_WriteFloatCoord(&sv.datagram, G_VECTOR(OFS_PARM0)[1]); - MSG_WriteFloatCoord(&sv.datagram, G_VECTOR(OFS_PARM0)[2]); + MSG_WriteDPCoord(&sv.datagram, G_VECTOR(OFS_PARM0)[0]); + MSG_WriteDPCoord(&sv.datagram, G_VECTOR(OFS_PARM0)[1]); + MSG_WriteDPCoord(&sv.datagram, G_VECTOR(OFS_PARM0)[2]); // max - MSG_WriteFloatCoord(&sv.datagram, G_VECTOR(OFS_PARM1)[0]); - MSG_WriteFloatCoord(&sv.datagram, G_VECTOR(OFS_PARM1)[1]); - MSG_WriteFloatCoord(&sv.datagram, G_VECTOR(OFS_PARM1)[2]); + MSG_WriteDPCoord(&sv.datagram, G_VECTOR(OFS_PARM1)[0]); + MSG_WriteDPCoord(&sv.datagram, G_VECTOR(OFS_PARM1)[1]); + MSG_WriteDPCoord(&sv.datagram, G_VECTOR(OFS_PARM1)[2]); // velocity - MSG_WriteFloatCoord(&sv.datagram, G_VECTOR(OFS_PARM2)[0]); - MSG_WriteFloatCoord(&sv.datagram, G_VECTOR(OFS_PARM2)[1]); - MSG_WriteFloatCoord(&sv.datagram, G_VECTOR(OFS_PARM2)[2]); + MSG_WriteDPCoord(&sv.datagram, G_VECTOR(OFS_PARM2)[0]); + MSG_WriteDPCoord(&sv.datagram, G_VECTOR(OFS_PARM2)[1]); + MSG_WriteDPCoord(&sv.datagram, G_VECTOR(OFS_PARM2)[2]); // count MSG_WriteShort(&sv.datagram, bound(0, G_FLOAT(OFS_PARM3), 65535)); // color @@ -2252,9 +2206,9 @@ void PF_te_spark (void) MSG_WriteByte(&sv.datagram, svc_temp_entity); MSG_WriteByte(&sv.datagram, TE_SPARK); // origin - MSG_WriteFloatCoord(&sv.datagram, G_VECTOR(OFS_PARM0)[0]); - MSG_WriteFloatCoord(&sv.datagram, G_VECTOR(OFS_PARM0)[1]); - MSG_WriteFloatCoord(&sv.datagram, G_VECTOR(OFS_PARM0)[2]); + MSG_WriteDPCoord(&sv.datagram, G_VECTOR(OFS_PARM0)[0]); + MSG_WriteDPCoord(&sv.datagram, G_VECTOR(OFS_PARM0)[1]); + MSG_WriteDPCoord(&sv.datagram, G_VECTOR(OFS_PARM0)[2]); // velocity MSG_WriteByte(&sv.datagram, bound(-128, (int) G_VECTOR(OFS_PARM1)[0], 127)); MSG_WriteByte(&sv.datagram, bound(-128, (int) G_VECTOR(OFS_PARM1)[1], 127)); @@ -2268,9 +2222,9 @@ void PF_te_gunshotquad (void) MSG_WriteByte(&sv.datagram, svc_temp_entity); MSG_WriteByte(&sv.datagram, TE_GUNSHOTQUAD); // origin - MSG_WriteFloatCoord(&sv.datagram, G_VECTOR(OFS_PARM0)[0]); - MSG_WriteFloatCoord(&sv.datagram, G_VECTOR(OFS_PARM0)[1]); - MSG_WriteFloatCoord(&sv.datagram, G_VECTOR(OFS_PARM0)[2]); + MSG_WriteDPCoord(&sv.datagram, G_VECTOR(OFS_PARM0)[0]); + MSG_WriteDPCoord(&sv.datagram, G_VECTOR(OFS_PARM0)[1]); + MSG_WriteDPCoord(&sv.datagram, G_VECTOR(OFS_PARM0)[2]); } void PF_te_spikequad (void) @@ -2278,9 +2232,9 @@ void PF_te_spikequad (void) MSG_WriteByte(&sv.datagram, svc_temp_entity); MSG_WriteByte(&sv.datagram, TE_SPIKEQUAD); // origin - MSG_WriteFloatCoord(&sv.datagram, G_VECTOR(OFS_PARM0)[0]); - MSG_WriteFloatCoord(&sv.datagram, G_VECTOR(OFS_PARM0)[1]); - MSG_WriteFloatCoord(&sv.datagram, G_VECTOR(OFS_PARM0)[2]); + MSG_WriteDPCoord(&sv.datagram, G_VECTOR(OFS_PARM0)[0]); + MSG_WriteDPCoord(&sv.datagram, G_VECTOR(OFS_PARM0)[1]); + MSG_WriteDPCoord(&sv.datagram, G_VECTOR(OFS_PARM0)[2]); } void PF_te_superspikequad (void) @@ -2288,9 +2242,9 @@ void PF_te_superspikequad (void) MSG_WriteByte(&sv.datagram, svc_temp_entity); MSG_WriteByte(&sv.datagram, TE_SUPERSPIKEQUAD); // origin - MSG_WriteFloatCoord(&sv.datagram, G_VECTOR(OFS_PARM0)[0]); - MSG_WriteFloatCoord(&sv.datagram, G_VECTOR(OFS_PARM0)[1]); - MSG_WriteFloatCoord(&sv.datagram, G_VECTOR(OFS_PARM0)[2]); + MSG_WriteDPCoord(&sv.datagram, G_VECTOR(OFS_PARM0)[0]); + MSG_WriteDPCoord(&sv.datagram, G_VECTOR(OFS_PARM0)[1]); + MSG_WriteDPCoord(&sv.datagram, G_VECTOR(OFS_PARM0)[2]); } void PF_te_explosionquad (void) @@ -2298,9 +2252,9 @@ void PF_te_explosionquad (void) MSG_WriteByte(&sv.datagram, svc_temp_entity); MSG_WriteByte(&sv.datagram, TE_EXPLOSIONQUAD); // origin - MSG_WriteFloatCoord(&sv.datagram, G_VECTOR(OFS_PARM0)[0]); - MSG_WriteFloatCoord(&sv.datagram, G_VECTOR(OFS_PARM0)[1]); - MSG_WriteFloatCoord(&sv.datagram, G_VECTOR(OFS_PARM0)[2]); + MSG_WriteDPCoord(&sv.datagram, G_VECTOR(OFS_PARM0)[0]); + MSG_WriteDPCoord(&sv.datagram, G_VECTOR(OFS_PARM0)[1]); + MSG_WriteDPCoord(&sv.datagram, G_VECTOR(OFS_PARM0)[2]); } void PF_te_smallflash (void) @@ -2308,9 +2262,9 @@ void PF_te_smallflash (void) MSG_WriteByte(&sv.datagram, svc_temp_entity); MSG_WriteByte(&sv.datagram, TE_SMALLFLASH); // origin - MSG_WriteFloatCoord(&sv.datagram, G_VECTOR(OFS_PARM0)[0]); - MSG_WriteFloatCoord(&sv.datagram, G_VECTOR(OFS_PARM0)[1]); - MSG_WriteFloatCoord(&sv.datagram, G_VECTOR(OFS_PARM0)[2]); + MSG_WriteDPCoord(&sv.datagram, G_VECTOR(OFS_PARM0)[0]); + MSG_WriteDPCoord(&sv.datagram, G_VECTOR(OFS_PARM0)[1]); + MSG_WriteDPCoord(&sv.datagram, G_VECTOR(OFS_PARM0)[2]); } void PF_te_customflash (void) @@ -2320,9 +2274,9 @@ void PF_te_customflash (void) MSG_WriteByte(&sv.datagram, svc_temp_entity); MSG_WriteByte(&sv.datagram, TE_CUSTOMFLASH); // origin - MSG_WriteFloatCoord(&sv.datagram, G_VECTOR(OFS_PARM0)[0]); - MSG_WriteFloatCoord(&sv.datagram, G_VECTOR(OFS_PARM0)[1]); - MSG_WriteFloatCoord(&sv.datagram, G_VECTOR(OFS_PARM0)[2]); + MSG_WriteDPCoord(&sv.datagram, G_VECTOR(OFS_PARM0)[0]); + MSG_WriteDPCoord(&sv.datagram, G_VECTOR(OFS_PARM0)[1]); + MSG_WriteDPCoord(&sv.datagram, G_VECTOR(OFS_PARM0)[2]); // radius MSG_WriteByte(&sv.datagram, bound(0, G_FLOAT(OFS_PARM1) / 8 - 1, 255)); // lifetime @@ -2338,9 +2292,9 @@ void PF_te_gunshot (void) MSG_WriteByte(&sv.datagram, svc_temp_entity); MSG_WriteByte(&sv.datagram, TE_GUNSHOT); // origin - MSG_WriteFloatCoord(&sv.datagram, G_VECTOR(OFS_PARM0)[0]); - MSG_WriteFloatCoord(&sv.datagram, G_VECTOR(OFS_PARM0)[1]); - MSG_WriteFloatCoord(&sv.datagram, G_VECTOR(OFS_PARM0)[2]); + MSG_WriteDPCoord(&sv.datagram, G_VECTOR(OFS_PARM0)[0]); + MSG_WriteDPCoord(&sv.datagram, G_VECTOR(OFS_PARM0)[1]); + MSG_WriteDPCoord(&sv.datagram, G_VECTOR(OFS_PARM0)[2]); } void PF_te_spike (void) @@ -2348,9 +2302,9 @@ void PF_te_spike (void) MSG_WriteByte(&sv.datagram, svc_temp_entity); MSG_WriteByte(&sv.datagram, TE_SPIKE); // origin - MSG_WriteFloatCoord(&sv.datagram, G_VECTOR(OFS_PARM0)[0]); - MSG_WriteFloatCoord(&sv.datagram, G_VECTOR(OFS_PARM0)[1]); - MSG_WriteFloatCoord(&sv.datagram, G_VECTOR(OFS_PARM0)[2]); + MSG_WriteDPCoord(&sv.datagram, G_VECTOR(OFS_PARM0)[0]); + MSG_WriteDPCoord(&sv.datagram, G_VECTOR(OFS_PARM0)[1]); + MSG_WriteDPCoord(&sv.datagram, G_VECTOR(OFS_PARM0)[2]); } void PF_te_superspike (void) @@ -2358,9 +2312,9 @@ void PF_te_superspike (void) MSG_WriteByte(&sv.datagram, svc_temp_entity); MSG_WriteByte(&sv.datagram, TE_SUPERSPIKE); // origin - MSG_WriteFloatCoord(&sv.datagram, G_VECTOR(OFS_PARM0)[0]); - MSG_WriteFloatCoord(&sv.datagram, G_VECTOR(OFS_PARM0)[1]); - MSG_WriteFloatCoord(&sv.datagram, G_VECTOR(OFS_PARM0)[2]); + MSG_WriteDPCoord(&sv.datagram, G_VECTOR(OFS_PARM0)[0]); + MSG_WriteDPCoord(&sv.datagram, G_VECTOR(OFS_PARM0)[1]); + MSG_WriteDPCoord(&sv.datagram, G_VECTOR(OFS_PARM0)[2]); } void PF_te_explosion (void) @@ -2368,9 +2322,9 @@ void PF_te_explosion (void) MSG_WriteByte(&sv.datagram, svc_temp_entity); MSG_WriteByte(&sv.datagram, TE_EXPLOSION); // origin - MSG_WriteFloatCoord(&sv.datagram, G_VECTOR(OFS_PARM0)[0]); - MSG_WriteFloatCoord(&sv.datagram, G_VECTOR(OFS_PARM0)[1]); - MSG_WriteFloatCoord(&sv.datagram, G_VECTOR(OFS_PARM0)[2]); + MSG_WriteDPCoord(&sv.datagram, G_VECTOR(OFS_PARM0)[0]); + MSG_WriteDPCoord(&sv.datagram, G_VECTOR(OFS_PARM0)[1]); + MSG_WriteDPCoord(&sv.datagram, G_VECTOR(OFS_PARM0)[2]); } void PF_te_tarexplosion (void) @@ -2378,9 +2332,9 @@ void PF_te_tarexplosion (void) MSG_WriteByte(&sv.datagram, svc_temp_entity); MSG_WriteByte(&sv.datagram, TE_TAREXPLOSION); // origin - MSG_WriteFloatCoord(&sv.datagram, G_VECTOR(OFS_PARM0)[0]); - MSG_WriteFloatCoord(&sv.datagram, G_VECTOR(OFS_PARM0)[1]); - MSG_WriteFloatCoord(&sv.datagram, G_VECTOR(OFS_PARM0)[2]); + MSG_WriteDPCoord(&sv.datagram, G_VECTOR(OFS_PARM0)[0]); + MSG_WriteDPCoord(&sv.datagram, G_VECTOR(OFS_PARM0)[1]); + MSG_WriteDPCoord(&sv.datagram, G_VECTOR(OFS_PARM0)[2]); } void PF_te_wizspike (void) @@ -2388,9 +2342,9 @@ void PF_te_wizspike (void) MSG_WriteByte(&sv.datagram, svc_temp_entity); MSG_WriteByte(&sv.datagram, TE_WIZSPIKE); // origin - MSG_WriteFloatCoord(&sv.datagram, G_VECTOR(OFS_PARM0)[0]); - MSG_WriteFloatCoord(&sv.datagram, G_VECTOR(OFS_PARM0)[1]); - MSG_WriteFloatCoord(&sv.datagram, G_VECTOR(OFS_PARM0)[2]); + MSG_WriteDPCoord(&sv.datagram, G_VECTOR(OFS_PARM0)[0]); + MSG_WriteDPCoord(&sv.datagram, G_VECTOR(OFS_PARM0)[1]); + MSG_WriteDPCoord(&sv.datagram, G_VECTOR(OFS_PARM0)[2]); } void PF_te_knightspike (void) @@ -2398,9 +2352,9 @@ void PF_te_knightspike (void) MSG_WriteByte(&sv.datagram, svc_temp_entity); MSG_WriteByte(&sv.datagram, TE_KNIGHTSPIKE); // origin - MSG_WriteFloatCoord(&sv.datagram, G_VECTOR(OFS_PARM0)[0]); - MSG_WriteFloatCoord(&sv.datagram, G_VECTOR(OFS_PARM0)[1]); - MSG_WriteFloatCoord(&sv.datagram, G_VECTOR(OFS_PARM0)[2]); + MSG_WriteDPCoord(&sv.datagram, G_VECTOR(OFS_PARM0)[0]); + MSG_WriteDPCoord(&sv.datagram, G_VECTOR(OFS_PARM0)[1]); + MSG_WriteDPCoord(&sv.datagram, G_VECTOR(OFS_PARM0)[2]); } void PF_te_lavasplash (void) @@ -2408,9 +2362,9 @@ void PF_te_lavasplash (void) MSG_WriteByte(&sv.datagram, svc_temp_entity); MSG_WriteByte(&sv.datagram, TE_LAVASPLASH); // origin - MSG_WriteFloatCoord(&sv.datagram, G_VECTOR(OFS_PARM0)[0]); - MSG_WriteFloatCoord(&sv.datagram, G_VECTOR(OFS_PARM0)[1]); - MSG_WriteFloatCoord(&sv.datagram, G_VECTOR(OFS_PARM0)[2]); + MSG_WriteDPCoord(&sv.datagram, G_VECTOR(OFS_PARM0)[0]); + MSG_WriteDPCoord(&sv.datagram, G_VECTOR(OFS_PARM0)[1]); + MSG_WriteDPCoord(&sv.datagram, G_VECTOR(OFS_PARM0)[2]); } void PF_te_teleport (void) @@ -2418,9 +2372,9 @@ void PF_te_teleport (void) MSG_WriteByte(&sv.datagram, svc_temp_entity); MSG_WriteByte(&sv.datagram, TE_TELEPORT); // origin - MSG_WriteFloatCoord(&sv.datagram, G_VECTOR(OFS_PARM0)[0]); - MSG_WriteFloatCoord(&sv.datagram, G_VECTOR(OFS_PARM0)[1]); - MSG_WriteFloatCoord(&sv.datagram, G_VECTOR(OFS_PARM0)[2]); + MSG_WriteDPCoord(&sv.datagram, G_VECTOR(OFS_PARM0)[0]); + MSG_WriteDPCoord(&sv.datagram, G_VECTOR(OFS_PARM0)[1]); + MSG_WriteDPCoord(&sv.datagram, G_VECTOR(OFS_PARM0)[2]); } void PF_te_explosion2 (void) @@ -2428,9 +2382,9 @@ void PF_te_explosion2 (void) MSG_WriteByte(&sv.datagram, svc_temp_entity); MSG_WriteByte(&sv.datagram, TE_EXPLOSION2); // origin - MSG_WriteFloatCoord(&sv.datagram, G_VECTOR(OFS_PARM0)[0]); - MSG_WriteFloatCoord(&sv.datagram, G_VECTOR(OFS_PARM0)[1]); - MSG_WriteFloatCoord(&sv.datagram, G_VECTOR(OFS_PARM0)[2]); + MSG_WriteDPCoord(&sv.datagram, G_VECTOR(OFS_PARM0)[0]); + MSG_WriteDPCoord(&sv.datagram, G_VECTOR(OFS_PARM0)[1]); + MSG_WriteDPCoord(&sv.datagram, G_VECTOR(OFS_PARM0)[2]); // color MSG_WriteByte(&sv.datagram, G_FLOAT(OFS_PARM1)); } @@ -2442,13 +2396,13 @@ void PF_te_lightning1 (void) // owner entity MSG_WriteShort(&sv.datagram, G_EDICTNUM(OFS_PARM0)); // start - MSG_WriteFloatCoord(&sv.datagram, G_VECTOR(OFS_PARM1)[0]); - MSG_WriteFloatCoord(&sv.datagram, G_VECTOR(OFS_PARM1)[1]); - MSG_WriteFloatCoord(&sv.datagram, G_VECTOR(OFS_PARM1)[2]); + MSG_WriteDPCoord(&sv.datagram, G_VECTOR(OFS_PARM1)[0]); + MSG_WriteDPCoord(&sv.datagram, G_VECTOR(OFS_PARM1)[1]); + MSG_WriteDPCoord(&sv.datagram, G_VECTOR(OFS_PARM1)[2]); // end - MSG_WriteFloatCoord(&sv.datagram, G_VECTOR(OFS_PARM2)[0]); - MSG_WriteFloatCoord(&sv.datagram, G_VECTOR(OFS_PARM2)[1]); - MSG_WriteFloatCoord(&sv.datagram, G_VECTOR(OFS_PARM2)[2]); + MSG_WriteDPCoord(&sv.datagram, G_VECTOR(OFS_PARM2)[0]); + MSG_WriteDPCoord(&sv.datagram, G_VECTOR(OFS_PARM2)[1]); + MSG_WriteDPCoord(&sv.datagram, G_VECTOR(OFS_PARM2)[2]); } void PF_te_lightning2 (void) @@ -2458,13 +2412,13 @@ void PF_te_lightning2 (void) // owner entity MSG_WriteShort(&sv.datagram, G_EDICTNUM(OFS_PARM0)); // start - MSG_WriteFloatCoord(&sv.datagram, G_VECTOR(OFS_PARM1)[0]); - MSG_WriteFloatCoord(&sv.datagram, G_VECTOR(OFS_PARM1)[1]); - MSG_WriteFloatCoord(&sv.datagram, G_VECTOR(OFS_PARM1)[2]); + MSG_WriteDPCoord(&sv.datagram, G_VECTOR(OFS_PARM1)[0]); + MSG_WriteDPCoord(&sv.datagram, G_VECTOR(OFS_PARM1)[1]); + MSG_WriteDPCoord(&sv.datagram, G_VECTOR(OFS_PARM1)[2]); // end - MSG_WriteFloatCoord(&sv.datagram, G_VECTOR(OFS_PARM2)[0]); - MSG_WriteFloatCoord(&sv.datagram, G_VECTOR(OFS_PARM2)[1]); - MSG_WriteFloatCoord(&sv.datagram, G_VECTOR(OFS_PARM2)[2]); + MSG_WriteDPCoord(&sv.datagram, G_VECTOR(OFS_PARM2)[0]); + MSG_WriteDPCoord(&sv.datagram, G_VECTOR(OFS_PARM2)[1]); + MSG_WriteDPCoord(&sv.datagram, G_VECTOR(OFS_PARM2)[2]); } void PF_te_lightning3 (void) @@ -2474,13 +2428,13 @@ void PF_te_lightning3 (void) // owner entity MSG_WriteShort(&sv.datagram, G_EDICTNUM(OFS_PARM0)); // start - MSG_WriteFloatCoord(&sv.datagram, G_VECTOR(OFS_PARM1)[0]); - MSG_WriteFloatCoord(&sv.datagram, G_VECTOR(OFS_PARM1)[1]); - MSG_WriteFloatCoord(&sv.datagram, G_VECTOR(OFS_PARM1)[2]); + MSG_WriteDPCoord(&sv.datagram, G_VECTOR(OFS_PARM1)[0]); + MSG_WriteDPCoord(&sv.datagram, G_VECTOR(OFS_PARM1)[1]); + MSG_WriteDPCoord(&sv.datagram, G_VECTOR(OFS_PARM1)[2]); // end - MSG_WriteFloatCoord(&sv.datagram, G_VECTOR(OFS_PARM2)[0]); - MSG_WriteFloatCoord(&sv.datagram, G_VECTOR(OFS_PARM2)[1]); - MSG_WriteFloatCoord(&sv.datagram, G_VECTOR(OFS_PARM2)[2]); + MSG_WriteDPCoord(&sv.datagram, G_VECTOR(OFS_PARM2)[0]); + MSG_WriteDPCoord(&sv.datagram, G_VECTOR(OFS_PARM2)[1]); + MSG_WriteDPCoord(&sv.datagram, G_VECTOR(OFS_PARM2)[2]); } void PF_te_beam (void) @@ -2490,13 +2444,22 @@ void PF_te_beam (void) // owner entity MSG_WriteShort(&sv.datagram, G_EDICTNUM(OFS_PARM0)); // start - MSG_WriteFloatCoord(&sv.datagram, G_VECTOR(OFS_PARM1)[0]); - MSG_WriteFloatCoord(&sv.datagram, G_VECTOR(OFS_PARM1)[1]); - MSG_WriteFloatCoord(&sv.datagram, G_VECTOR(OFS_PARM1)[2]); + MSG_WriteDPCoord(&sv.datagram, G_VECTOR(OFS_PARM1)[0]); + MSG_WriteDPCoord(&sv.datagram, G_VECTOR(OFS_PARM1)[1]); + MSG_WriteDPCoord(&sv.datagram, G_VECTOR(OFS_PARM1)[2]); // end - MSG_WriteFloatCoord(&sv.datagram, G_VECTOR(OFS_PARM2)[0]); - MSG_WriteFloatCoord(&sv.datagram, G_VECTOR(OFS_PARM2)[1]); - MSG_WriteFloatCoord(&sv.datagram, G_VECTOR(OFS_PARM2)[2]); + MSG_WriteDPCoord(&sv.datagram, G_VECTOR(OFS_PARM2)[0]); + MSG_WriteDPCoord(&sv.datagram, G_VECTOR(OFS_PARM2)[1]); + MSG_WriteDPCoord(&sv.datagram, G_VECTOR(OFS_PARM2)[2]); +} + +void PF_te_plasmaburn (void) +{ + MSG_WriteByte(&sv.datagram, svc_temp_entity); + MSG_WriteByte(&sv.datagram, TE_PLASMABURN); + MSG_WriteDPCoord(&sv.datagram, G_VECTOR(OFS_PARM0)[0]); + MSG_WriteDPCoord(&sv.datagram, G_VECTOR(OFS_PARM0)[1]); + MSG_WriteDPCoord(&sv.datagram, G_VECTOR(OFS_PARM0)[2]); } void PF_Fixme (void) @@ -2597,7 +2560,7 @@ PF_precache_file, PF_setspawnparms, PF_Fixme, // #79 LordHavoc: dunno who owns 79-89, so these are just padding -PF_Fixme, // #80 +PF_Fixme, // #80 PF_Fixme, // #81 PF_Fixme, // #82 PF_Fixme, // #83 @@ -2656,7 +2619,9 @@ PF_te_lightning2, // #429 PF_te_lightning3, // #430 PF_te_beam, // #431 PF_vectorvectors, // #432 +PF_te_plasmaburn, // #433 }; builtin_t *pr_builtins = pr_builtin; int pr_numbuiltins = sizeof(pr_builtin)/sizeof(pr_builtin[0]); +