X-Git-Url: https://de.git.xonotic.org/?a=blobdiff_plain;f=pr_cmds.c;h=85dbfcefeb89764606357c481959f234dd5f0d8c;hb=668a437d46dfad040c8e32398fd7cb916345f7d1;hp=1665e497119ee3c2bffbd41019a06637c34c6461;hpb=eb3d71b9feaefca24fe80b9970eb11d07fd295b5;p=xonotic%2Fdarkplaces.git diff --git a/pr_cmds.c b/pr_cmds.c index 1665e497..85dbfcef 100644 --- a/pr_cmds.c +++ b/pr_cmds.c @@ -105,7 +105,7 @@ qboolean checkextension(char *name) while (*e && *e != ' ') e++; if (e - start == len) - if (!strncasecmp(e, name, len)) + if (!strncasecmp(start, name, len)) return true; } return false; @@ -168,13 +168,9 @@ void PF_objerror (void) ed = PROG_TO_EDICT(pr_global_struct->self); ED_Print (ed); ED_Free (ed); - -// LordHavoc: bug fix - no longer kills server -// Host_Error ("Program error"); } - /* ============== PF_makevectors @@ -225,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); @@ -356,24 +284,11 @@ void PF_setmodel (void) 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_ForName (m, true); + mod = sv.models[ (int)e->v.modelindex]; 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->normalmins, mod->normalmaxs, true); else SetMinMaxSize (e, vec3_origin, vec3_origin, true); @@ -727,8 +642,6 @@ break() */ void PF_break (void) { -// Con_Printf ("break statement\n"); -// *(int *)-4 = 0; // dump to debugger PR_RunError ("break statement"); } @@ -858,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; @@ -1055,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); @@ -1117,12 +1036,6 @@ void PF_ftos (void) v = G_FLOAT(OFS_PARM0); s = PR_GetTempString(); - /* - if (v == (int)v) - sprintf (s, "%d",(int)v); - else - sprintf (s, "%5.1f",v); - */ // LordHavoc: ftos improvement sprintf (s, "%g", v); G_INT(OFS_RETURN) = s - pr_strings; @@ -1314,7 +1227,7 @@ 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"); @@ -1439,12 +1352,12 @@ 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, MOVE_NORMAL, ent); if (trace.fraction == 1 || trace.allsolid) @@ -1456,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; } } @@ -1472,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) { @@ -1528,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; } /* @@ -1542,7 +1457,7 @@ void PF_nextent (void) { int i; edict_t *ent; - + i = G_EDICTNUM(OFS_PARM0); while (1) { @@ -1577,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); @@ -1588,8 +1503,8 @@ void PF_aim (void) VectorCopy (pr_global_struct->v_forward, dir); VectorMA (start, 2048, dir, end); tr = SV_Move (start, vec3_origin, vec3_origin, end, MOVE_NORMAL, ent); - if (tr.ent && tr.ent->v.takedamage == DAMAGE_AIM - && (!teamplay.integer || ent->v.team <=0 || ent->v.team != tr.ent->v.team) ) + 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; @@ -1600,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.origin, ent->v.origin, dir); @@ -1633,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 { @@ -1652,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; @@ -1681,7 +1596,7 @@ void PF_changeyaw (void) if (move < -speed) move = -speed; } - + ent->v.angles[1] = ANGLEMOD (current + move); } @@ -1695,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))) @@ -1712,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; @@ -1736,7 +1651,7 @@ void PF_changepitch (void) if (move < -speed) move = -speed; } - + ent->v.angles[0] = ANGLEMOD (current + move); } @@ -1764,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; @@ -1782,7 +1697,7 @@ sizebuf_t *WriteDest (void) PR_RunError ("WriteDest: bad destination"); break; } - + return NULL; } @@ -1835,7 +1750,7 @@ void PF_makestatic (void) { edict_t *ent; int i, large; - + ent = G_EDICT(OFS_PARM0); large = false; @@ -1905,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)); } @@ -1944,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); @@ -1966,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 @@ -1977,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)) { @@ -1996,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; @@ -2120,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); @@ -2709,3 +2624,4 @@ PF_te_plasmaburn, // #433 builtin_t *pr_builtins = pr_builtin; int pr_numbuiltins = sizeof(pr_builtin)/sizeof(pr_builtin[0]); +