2004-08-23 00:15:46 +00:00
|
|
|
/*
|
|
|
|
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
|
2006-02-17 19:54:47 +00:00
|
|
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
|
2004-08-23 00:15:46 +00:00
|
|
|
|
|
|
|
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 the Free Software
|
|
|
|
Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
|
|
|
|
|
|
|
|
*/
|
|
|
|
// sv_phys.c
|
|
|
|
|
|
|
|
#include "qwsvdef.h"
|
2004-11-29 01:21:00 +00:00
|
|
|
#ifndef CLIENTONLY
|
2009-11-05 01:22:27 +00:00
|
|
|
|
Fixes, workarounds, and breakages. Hexen2 should work much better (-hexen2 says no mission pack, -portals says h2mp). Started working on splitting bigcoords per client, far too much work still to go on that. Removed gl_ztrick entirely. Enabled csprogs download by default. Added client support for fitzquake's 666 protocol, needs testing, some cleanup for dp protocols too, no server support, couldn't selectively enable it anyway. Now attempting to cache shadow meshes for explosions and stuff. Played with lightmaps a little, should potentially run a little faster on certain (intel?) cards. Tweeked npfte a little to try to avoid deadlocks and crashes. Fixed sky worldspawn parsing. Added h2mp's model format. Fixed baseline issue in q2 client, made servers generate q2 baselines. MOVETYPE_PUSH will not rotate extra if rotation is forced. Made status command show allowed client types. Changed lighting on weapons - should now be shaded.
git-svn-id: https://svn.code.sf.net/p/fteqw/code/branches/wip@3572 fc73d0e0-1445-4013-8a0c-d673dee63da5
2010-08-11 03:36:31 +00:00
|
|
|
#include "pr_common.h"
|
|
|
|
|
2009-11-05 01:22:27 +00:00
|
|
|
#pragma message("fixme, fix this up before adding to csqc")
|
2004-08-23 00:15:46 +00:00
|
|
|
extern nqglobalvars_t realpr_nqglobal_struct;
|
|
|
|
|
|
|
|
/*
|
|
|
|
|
|
|
|
|
|
|
|
pushmove objects do not obey gravity, and do not interact with each other or trigger fields, but block normal movement and push normal objects when they move.
|
|
|
|
|
2006-02-17 19:54:47 +00:00
|
|
|
onground is set for toss objects when they come to a complete rest. it is set for steping or walking objects
|
2004-08-23 00:15:46 +00:00
|
|
|
|
|
|
|
doors, plats, etc are SOLID_BSP, and MOVETYPE_PUSH
|
|
|
|
bonus items are SOLID_TRIGGER touch, and MOVETYPE_TOSS
|
|
|
|
corpses are SOLID_NOT and MOVETYPE_TOSS
|
|
|
|
crates are SOLID_BBOX and MOVETYPE_TOSS
|
|
|
|
walking monsters are SOLID_SLIDEBOX and MOVETYPE_STEP
|
|
|
|
flying/floating monsters are SOLID_SLIDEBOX and MOVETYPE_FLY
|
|
|
|
|
|
|
|
solid_edge items only clip against bsp models.
|
|
|
|
|
|
|
|
*/
|
|
|
|
|
2006-02-11 02:09:43 +00:00
|
|
|
cvar_t sv_maxvelocity = SCVAR("sv_maxvelocity","2000");
|
|
|
|
|
|
|
|
cvar_t sv_gravity = SCVAR( "sv_gravity", "800");
|
|
|
|
cvar_t sv_stopspeed = SCVAR( "sv_stopspeed", "100");
|
|
|
|
cvar_t sv_maxspeed = SCVAR( "sv_maxspeed", "320");
|
|
|
|
cvar_t sv_spectatormaxspeed = SCVAR( "sv_spectatormaxspeed", "500");
|
|
|
|
cvar_t sv_accelerate = SCVAR( "sv_accelerate", "10");
|
|
|
|
cvar_t sv_airaccelerate = SCVAR( "sv_airaccelerate", "0.7");
|
|
|
|
cvar_t sv_wateraccelerate = SCVAR( "sv_wateraccelerate", "10");
|
|
|
|
cvar_t sv_friction = SCVAR( "sv_friction", "4");
|
|
|
|
cvar_t sv_waterfriction = SCVAR( "sv_waterfriction", "4");
|
2006-02-17 19:54:47 +00:00
|
|
|
cvar_t sv_gameplayfix_noairborncorpse = SCVAR( "sv_gameplayfix_noairborncorpse", "0");
|
2010-12-18 17:02:47 +00:00
|
|
|
cvar_t sv_sound_watersplash = CVAR( "sv_sound_watersplash", "misc/h2ohit1.wav");
|
2006-02-11 02:09:43 +00:00
|
|
|
|
2006-05-25 23:08:37 +00:00
|
|
|
cvar_t pm_ktjump = SCVARF("pm_ktjump", "0", CVAR_SERVERINFO);
|
|
|
|
cvar_t pm_bunnyspeedcap = SCVARF("pm_bunnyspeedcap", "0", CVAR_SERVERINFO);
|
|
|
|
cvar_t pm_slidefix = SCVARF("pm_slidefix", "0", CVAR_SERVERINFO);
|
|
|
|
cvar_t pm_slidyslopes = SCVARF("pm_slidyslopes", "0", CVAR_SERVERINFO);
|
|
|
|
cvar_t pm_airstep = SCVARF("pm_airstep", "0", CVAR_SERVERINFO);
|
|
|
|
cvar_t pm_walljump = SCVARF("pm_walljump", "0", CVAR_SERVERINFO);
|
2010-07-11 02:22:39 +00:00
|
|
|
cvar_t pm_stepheight = CVARAF("pm_stepheight", "18",
|
|
|
|
"sv_stepheight", CVAR_SERVERINFO);
|
2004-08-23 00:15:46 +00:00
|
|
|
|
|
|
|
extern cvar_t sv_nomsec;
|
|
|
|
|
|
|
|
|
|
|
|
#define MOVE_EPSILON 0.01
|
|
|
|
|
2010-07-11 10:53:13 +00:00
|
|
|
static void SV_Physics_Toss (edict_t *ent);
|
2004-08-23 00:15:46 +00:00
|
|
|
|
|
|
|
/*
|
|
|
|
================
|
|
|
|
SV_CheckAllEnts
|
|
|
|
================
|
|
|
|
*/
|
2010-07-11 10:53:13 +00:00
|
|
|
static void SV_CheckAllEnts (void)
|
2004-08-23 00:15:46 +00:00
|
|
|
{
|
|
|
|
int e;
|
|
|
|
edict_t *check;
|
|
|
|
|
|
|
|
// see if any solid entities are inside the final position
|
2009-11-04 21:16:50 +00:00
|
|
|
for (e=1 ; e<sv.world.num_edicts ; e++)
|
2004-08-23 00:15:46 +00:00
|
|
|
{
|
|
|
|
check = EDICT_NUM(svprogfuncs, e);
|
|
|
|
if (check->isfree)
|
|
|
|
continue;
|
2005-03-28 00:11:59 +00:00
|
|
|
if (check->v->movetype == MOVETYPE_PUSH
|
|
|
|
|| check->v->movetype == MOVETYPE_NONE
|
|
|
|
|| check->v->movetype == MOVETYPE_FOLLOW
|
2011-02-27 15:01:56 +00:00
|
|
|
|| check->v->movetype == MOVETYPE_NOCLIP
|
|
|
|
|| check->v->movetype == MOVETYPE_ANGLENOCLIP)
|
2004-08-23 00:15:46 +00:00
|
|
|
continue;
|
|
|
|
|
2009-11-04 21:16:50 +00:00
|
|
|
if (World_TestEntityPosition (&sv.world, (wedict_t*)check))
|
2004-08-23 00:15:46 +00:00
|
|
|
Con_Printf ("entity in invalid position\n");
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
================
|
|
|
|
SV_CheckVelocity
|
|
|
|
================
|
|
|
|
*/
|
|
|
|
void SV_CheckVelocity (edict_t *ent)
|
|
|
|
{
|
|
|
|
int i;
|
|
|
|
|
|
|
|
//
|
|
|
|
// bound velocity
|
|
|
|
//
|
|
|
|
for (i=0 ; i<3 ; i++)
|
|
|
|
{
|
2005-03-28 00:11:59 +00:00
|
|
|
if (IS_NAN(ent->v->velocity[i]))
|
2004-08-23 00:15:46 +00:00
|
|
|
{
|
2005-03-28 00:11:59 +00:00
|
|
|
Con_Printf ("Got a NaN velocity on %s\n", PR_GetString(svprogfuncs, ent->v->classname));
|
|
|
|
ent->v->velocity[i] = 0;
|
2004-08-23 00:15:46 +00:00
|
|
|
}
|
2005-03-28 00:11:59 +00:00
|
|
|
if (IS_NAN(ent->v->origin[i]))
|
2004-08-23 00:15:46 +00:00
|
|
|
{
|
2005-03-28 00:11:59 +00:00
|
|
|
Con_Printf ("Got a NaN origin on %s\n", PR_GetString(svprogfuncs, ent->v->classname));
|
|
|
|
ent->v->origin[i] = 0;
|
2004-08-23 00:15:46 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2005-03-28 00:11:59 +00:00
|
|
|
if (Length(ent->v->velocity) > sv_maxvelocity.value)
|
2004-08-23 00:15:46 +00:00
|
|
|
{
|
2005-03-28 00:11:59 +00:00
|
|
|
// Con_DPrintf("Slowing %s\n", PR_GetString(svprogfuncs, ent->v->classname));
|
|
|
|
VectorScale (ent->v->velocity, sv_maxvelocity.value/Length(ent->v->velocity), ent->v->velocity);
|
2004-08-23 00:15:46 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
=============
|
|
|
|
SV_RunThink
|
|
|
|
|
|
|
|
Runs thinking code if time. There is some play in the exact time the think
|
|
|
|
function will be called, because it is called before any movement is done
|
|
|
|
in a frame. Not used for pushmove objects, because they must be exact.
|
|
|
|
Returns false if the entity removed itself.
|
|
|
|
=============
|
|
|
|
*/
|
|
|
|
qboolean SV_RunThink (edict_t *ent)
|
|
|
|
{
|
|
|
|
float thinktime;
|
|
|
|
|
2010-07-11 02:22:39 +00:00
|
|
|
if (sv_nomsec.ival>=2) //try and imitate nq as closeley as possible
|
2005-08-26 22:56:51 +00:00
|
|
|
{
|
|
|
|
thinktime = ent->v->nextthink;
|
2009-11-04 21:16:50 +00:00
|
|
|
if (thinktime <= 0 || thinktime > sv.world.physicstime + host_frametime)
|
2005-08-26 22:56:51 +00:00
|
|
|
return true;
|
2006-02-17 19:54:47 +00:00
|
|
|
|
2009-11-04 21:16:50 +00:00
|
|
|
if (thinktime < sv.world.physicstime)
|
|
|
|
thinktime = sv.world.physicstime; // don't let things stay in the past.
|
2005-08-26 22:56:51 +00:00
|
|
|
// it is possible to start that way
|
|
|
|
// by a trigger with a local time.
|
|
|
|
ent->v->nextthink = 0;
|
|
|
|
pr_global_struct->time = thinktime;
|
|
|
|
pr_global_struct->self = EDICT_TO_PROG(svprogfuncs, ent);
|
2009-11-04 21:16:50 +00:00
|
|
|
pr_global_struct->other = EDICT_TO_PROG(svprogfuncs, sv.world.edicts);
|
2007-09-02 19:55:17 +00:00
|
|
|
#ifdef VM_Q1
|
|
|
|
if (svs.gametype == GT_Q1QVM)
|
|
|
|
Q1QVM_Think();
|
|
|
|
else
|
|
|
|
#endif
|
|
|
|
PR_ExecuteProgram (svprogfuncs, ent->v->think);
|
2005-08-26 22:56:51 +00:00
|
|
|
return !ent->isfree;
|
|
|
|
}
|
|
|
|
|
2004-08-23 00:15:46 +00:00
|
|
|
do
|
|
|
|
{
|
2005-03-28 00:11:59 +00:00
|
|
|
thinktime = ent->v->nextthink;
|
2004-08-23 00:15:46 +00:00
|
|
|
if (thinktime <= 0)
|
|
|
|
return true;
|
2009-11-04 21:16:50 +00:00
|
|
|
if (thinktime > sv.world.physicstime + host_frametime)
|
2004-08-23 00:15:46 +00:00
|
|
|
return true;
|
2006-02-17 19:54:47 +00:00
|
|
|
|
2009-11-04 21:16:50 +00:00
|
|
|
if (thinktime < sv.world.physicstime)
|
|
|
|
thinktime = sv.world.physicstime; // don't let things stay in the past.
|
2004-08-23 00:15:46 +00:00
|
|
|
// it is possible to start that way
|
|
|
|
// by a trigger with a local time.
|
2005-03-28 00:11:59 +00:00
|
|
|
ent->v->nextthink = 0;
|
2004-08-23 00:15:46 +00:00
|
|
|
|
|
|
|
pr_global_struct->time = thinktime;
|
|
|
|
pr_global_struct->self = EDICT_TO_PROG(svprogfuncs, ent);
|
2009-11-04 21:16:50 +00:00
|
|
|
pr_global_struct->other = EDICT_TO_PROG(svprogfuncs, sv.world.edicts);
|
2007-09-02 19:55:17 +00:00
|
|
|
#ifdef VM_Q1
|
|
|
|
if (svs.gametype == GT_Q1QVM)
|
|
|
|
Q1QVM_Think();
|
|
|
|
else
|
|
|
|
#endif
|
|
|
|
PR_ExecuteProgram (svprogfuncs, ent->v->think);
|
2004-08-23 00:15:46 +00:00
|
|
|
|
|
|
|
if (ent->isfree)
|
|
|
|
return false;
|
|
|
|
|
2005-03-28 00:11:59 +00:00
|
|
|
if (ent->v->nextthink <= thinktime) //hmm... infinate loop was possible here.. Quite a few non-QW mods do this.
|
2004-08-23 00:15:46 +00:00
|
|
|
return true;
|
|
|
|
} while (1);
|
|
|
|
|
|
|
|
return true;
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
==================
|
|
|
|
SV_Impact
|
|
|
|
|
|
|
|
Two entities have touched, so run their touch functions
|
|
|
|
==================
|
|
|
|
*/
|
2010-07-11 10:53:13 +00:00
|
|
|
static void SV_Impact (edict_t *e1, edict_t *e2)
|
2004-08-23 00:15:46 +00:00
|
|
|
{
|
|
|
|
int old_self, old_other;
|
2006-02-17 19:54:47 +00:00
|
|
|
|
2004-08-23 00:15:46 +00:00
|
|
|
old_self = pr_global_struct->self;
|
|
|
|
old_other = pr_global_struct->other;
|
2006-02-17 19:54:47 +00:00
|
|
|
|
2009-11-04 21:16:50 +00:00
|
|
|
pr_global_struct->time = sv.world.physicstime;
|
2005-03-28 00:11:59 +00:00
|
|
|
if (e1->v->touch && e1->v->solid != SOLID_NOT)
|
2004-08-23 00:15:46 +00:00
|
|
|
{
|
|
|
|
pr_global_struct->self = EDICT_TO_PROG(svprogfuncs, e1);
|
|
|
|
pr_global_struct->other = EDICT_TO_PROG(svprogfuncs, e2);
|
2007-09-02 19:55:17 +00:00
|
|
|
#ifdef VM_Q1
|
|
|
|
if (svs.gametype == GT_Q1QVM)
|
|
|
|
Q1QVM_Touch();
|
|
|
|
else
|
|
|
|
#endif
|
|
|
|
PR_ExecuteProgram (svprogfuncs, e1->v->touch);
|
2004-08-23 00:15:46 +00:00
|
|
|
}
|
2006-02-17 19:54:47 +00:00
|
|
|
|
2005-03-28 00:11:59 +00:00
|
|
|
if (e2->v->touch && e2->v->solid != SOLID_NOT)
|
2004-08-23 00:15:46 +00:00
|
|
|
{
|
|
|
|
pr_global_struct->self = EDICT_TO_PROG(svprogfuncs, e2);
|
|
|
|
pr_global_struct->other = EDICT_TO_PROG(svprogfuncs, e1);
|
2007-09-02 19:55:17 +00:00
|
|
|
#ifdef VM_Q1
|
|
|
|
if (svs.gametype == GT_Q1QVM)
|
|
|
|
Q1QVM_Touch();
|
|
|
|
else
|
|
|
|
#endif
|
|
|
|
PR_ExecuteProgram (svprogfuncs, e2->v->touch);
|
2004-08-23 00:15:46 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
pr_global_struct->self = old_self;
|
|
|
|
pr_global_struct->other = old_other;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
/*
|
|
|
|
==================
|
|
|
|
ClipVelocity
|
|
|
|
|
|
|
|
Slide off of the impacting object
|
|
|
|
==================
|
|
|
|
*/
|
|
|
|
#define STOP_EPSILON 0.1
|
2004-09-22 15:29:33 +00:00
|
|
|
//courtesy of darkplaces, it's just more efficient.
|
2010-07-11 10:53:13 +00:00
|
|
|
static void ClipVelocity (vec3_t in, vec3_t normal, vec3_t out, float overbounce)
|
2004-08-23 00:15:46 +00:00
|
|
|
{
|
2004-09-22 15:29:33 +00:00
|
|
|
int i;
|
|
|
|
float backoff;
|
2004-08-23 00:15:46 +00:00
|
|
|
|
2004-09-22 15:29:33 +00:00
|
|
|
backoff = -DotProduct (in, normal) * overbounce;
|
|
|
|
VectorMA(in, backoff, normal, out);
|
|
|
|
|
|
|
|
for (i = 0;i < 3;i++)
|
2004-08-23 00:15:46 +00:00
|
|
|
if (out[i] > -STOP_EPSILON && out[i] < STOP_EPSILON)
|
|
|
|
out[i] = 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2004-09-22 15:29:33 +00:00
|
|
|
|
2004-08-23 00:15:46 +00:00
|
|
|
/*
|
|
|
|
============
|
|
|
|
SV_FlyMove
|
|
|
|
|
|
|
|
The basic solid body movement clip that slides along multiple planes
|
|
|
|
Returns the clipflags if the velocity was modified (hit something solid)
|
|
|
|
1 = floor
|
|
|
|
2 = wall / step
|
|
|
|
4 = dead stop
|
|
|
|
If steptrace is not NULL, the trace of any vertical wall hit will be stored
|
|
|
|
============
|
|
|
|
*/
|
|
|
|
#define MAX_CLIP_PLANES 5
|
2010-07-11 10:53:13 +00:00
|
|
|
static int SV_FlyMove (edict_t *ent, float time, trace_t *steptrace)
|
2004-08-23 00:15:46 +00:00
|
|
|
{
|
|
|
|
int bumpcount, numbumps;
|
|
|
|
vec3_t dir;
|
|
|
|
float d;
|
|
|
|
int numplanes;
|
|
|
|
vec3_t planes[MAX_CLIP_PLANES];
|
|
|
|
vec3_t primal_velocity, original_velocity, new_velocity;
|
|
|
|
int i, j;
|
|
|
|
trace_t trace;
|
|
|
|
vec3_t end;
|
|
|
|
float time_left;
|
|
|
|
int blocked;
|
2004-11-19 17:43:55 +00:00
|
|
|
vec3_t diff;
|
2005-05-15 18:49:04 +00:00
|
|
|
|
|
|
|
vec3_t startorg;
|
2006-02-17 19:54:47 +00:00
|
|
|
|
2004-08-23 00:15:46 +00:00
|
|
|
numbumps = 4;
|
2006-02-17 19:54:47 +00:00
|
|
|
|
2004-08-23 00:15:46 +00:00
|
|
|
blocked = 0;
|
2005-03-28 00:11:59 +00:00
|
|
|
VectorCopy (ent->v->velocity, original_velocity);
|
|
|
|
VectorCopy (ent->v->velocity, primal_velocity);
|
2004-08-23 00:15:46 +00:00
|
|
|
numplanes = 0;
|
2006-02-17 19:54:47 +00:00
|
|
|
|
2004-08-23 00:15:46 +00:00
|
|
|
time_left = time;
|
|
|
|
|
2005-05-15 18:49:04 +00:00
|
|
|
VectorCopy (ent->v->origin, startorg);
|
|
|
|
|
2004-08-23 00:15:46 +00:00
|
|
|
for (bumpcount=0 ; bumpcount<numbumps ; bumpcount++)
|
|
|
|
{
|
|
|
|
for (i=0 ; i<3 ; i++)
|
2005-03-28 00:11:59 +00:00
|
|
|
end[i] = ent->v->origin[i] + time_left * ent->v->velocity[i];
|
2004-08-23 00:15:46 +00:00
|
|
|
|
2009-11-04 21:16:50 +00:00
|
|
|
trace = World_Move (&sv.world, ent->v->origin, ent->v->mins, ent->v->maxs, end, false, (wedict_t*)ent);
|
2004-08-23 00:15:46 +00:00
|
|
|
|
2004-12-08 04:14:52 +00:00
|
|
|
if (trace.startsolid)
|
2004-08-23 00:15:46 +00:00
|
|
|
{ // entity is trapped in another solid
|
2006-05-29 04:50:24 +00:00
|
|
|
VectorClear (ent->v->velocity);
|
2004-08-23 00:15:46 +00:00
|
|
|
return 3;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (trace.fraction > 0)
|
|
|
|
{ // actually covered some distance
|
2005-03-28 00:11:59 +00:00
|
|
|
VectorCopy (trace.endpos, ent->v->origin);
|
|
|
|
VectorCopy (ent->v->velocity, original_velocity);
|
2004-08-23 00:15:46 +00:00
|
|
|
numplanes = 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (trace.fraction == 1)
|
|
|
|
break; // moved the entire distance
|
|
|
|
|
|
|
|
if (!trace.ent)
|
|
|
|
SV_Error ("SV_FlyMove: !trace.ent");
|
|
|
|
|
|
|
|
if (trace.plane.normal[2] > 0.7)
|
|
|
|
{
|
|
|
|
blocked |= 1; // floor
|
2009-03-03 01:52:30 +00:00
|
|
|
if (((edict_t *)trace.ent)->v->solid == SOLID_BSP)
|
2004-08-23 00:15:46 +00:00
|
|
|
{
|
2005-03-28 00:11:59 +00:00
|
|
|
ent->v->flags = (int)ent->v->flags | FL_ONGROUND;
|
|
|
|
ent->v->groundentity = EDICT_TO_PROG(svprogfuncs, trace.ent);
|
2004-08-23 00:15:46 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
if (!trace.plane.normal[2])
|
|
|
|
{
|
|
|
|
blocked |= 2; // step
|
|
|
|
if (steptrace)
|
|
|
|
*steptrace = trace; // save for player extrafriction
|
|
|
|
}
|
|
|
|
|
|
|
|
//
|
|
|
|
// run the impact function
|
|
|
|
//
|
|
|
|
SV_Impact (ent, trace.ent);
|
|
|
|
if (ent->isfree)
|
|
|
|
break; // removed by the impact function
|
|
|
|
|
2006-02-17 19:54:47 +00:00
|
|
|
|
2004-08-23 00:15:46 +00:00
|
|
|
time_left -= time_left * trace.fraction;
|
2006-02-17 19:54:47 +00:00
|
|
|
|
2004-08-23 00:15:46 +00:00
|
|
|
// cliped to another plane
|
|
|
|
if (numplanes >= MAX_CLIP_PLANES)
|
|
|
|
{ // this shouldn't really happen
|
2006-05-29 04:50:24 +00:00
|
|
|
VectorClear (ent->v->velocity);
|
2004-11-19 17:43:55 +00:00
|
|
|
if (steptrace)
|
|
|
|
*steptrace = trace; // save for player extrafriction
|
2004-08-23 00:15:46 +00:00
|
|
|
return 3;
|
|
|
|
}
|
|
|
|
|
2004-10-03 22:52:02 +00:00
|
|
|
if (0)
|
2004-08-23 00:15:46 +00:00
|
|
|
{
|
2005-03-28 00:11:59 +00:00
|
|
|
ClipVelocity(ent->v->velocity, trace.plane.normal, ent->v->velocity, 1);
|
2004-09-22 15:29:33 +00:00
|
|
|
break;
|
2004-08-23 00:15:46 +00:00
|
|
|
}
|
|
|
|
else
|
2004-09-22 15:29:33 +00:00
|
|
|
{
|
2004-12-24 09:10:39 +00:00
|
|
|
if (numplanes)
|
|
|
|
{
|
|
|
|
VectorSubtract(planes[0], trace.plane.normal, diff);
|
|
|
|
if (Length(diff) < 0.01)
|
|
|
|
continue; //hit this plane already
|
|
|
|
}
|
2004-11-19 17:43:55 +00:00
|
|
|
|
2004-09-22 15:29:33 +00:00
|
|
|
VectorCopy (trace.plane.normal, planes[numplanes]);
|
|
|
|
numplanes++;
|
|
|
|
|
|
|
|
//
|
|
|
|
// modify original_velocity so it parallels all of the clip planes
|
|
|
|
//
|
|
|
|
for (i=0 ; i<numplanes ; i++)
|
2004-08-23 00:15:46 +00:00
|
|
|
{
|
2004-09-22 15:29:33 +00:00
|
|
|
ClipVelocity (original_velocity, planes[i], new_velocity, 1);
|
|
|
|
for (j=0 ; j<numplanes ; j++)
|
|
|
|
if (j != i)
|
|
|
|
{
|
|
|
|
if (DotProduct (new_velocity, planes[j]) < 0)
|
|
|
|
break; // not ok
|
|
|
|
}
|
|
|
|
if (j == numplanes)
|
|
|
|
break;
|
|
|
|
}
|
2004-11-19 17:43:55 +00:00
|
|
|
|
2004-09-22 15:29:33 +00:00
|
|
|
if (i != numplanes)
|
|
|
|
{ // go along this plane
|
2005-03-28 00:11:59 +00:00
|
|
|
// Con_Printf ("%5.1f %5.1f %5.1f ",ent->v->velocity[0], ent->v->velocity[1], ent->v->velocity[2]);
|
|
|
|
VectorCopy (new_velocity, ent->v->velocity);
|
|
|
|
// Con_Printf ("%5.1f %5.1f %5.1f\n",ent->v->velocity[0], ent->v->velocity[1], ent->v->velocity[2]);
|
2004-09-22 15:29:33 +00:00
|
|
|
}
|
|
|
|
else
|
|
|
|
{ // go along the crease
|
|
|
|
if (numplanes != 2)
|
|
|
|
{
|
2004-10-18 10:50:23 +00:00
|
|
|
// Con_Printf ("clip velocity, numplanes == %i\n",numplanes);
|
2005-03-28 00:11:59 +00:00
|
|
|
// Con_Printf ("%5.1f %5.1f %5.1f ",ent->v->velocity[0], ent->v->velocity[1], ent->v->velocity[2]);
|
2006-05-29 04:50:24 +00:00
|
|
|
VectorClear (ent->v->velocity);
|
2005-03-28 00:11:59 +00:00
|
|
|
// Con_Printf ("%5.1f %5.1f %5.1f\n",ent->v->velocity[0], ent->v->velocity[1], ent->v->velocity[2]);
|
2004-09-22 15:29:33 +00:00
|
|
|
return 7;
|
|
|
|
}
|
2005-03-28 00:11:59 +00:00
|
|
|
// Con_Printf ("%5.1f %5.1f %5.1f ",ent->v->velocity[0], ent->v->velocity[1], ent->v->velocity[2]);
|
2004-09-22 15:29:33 +00:00
|
|
|
CrossProduct (planes[0], planes[1], dir);
|
|
|
|
VectorNormalize(dir); //fixes slow falling in corners
|
2005-03-28 00:11:59 +00:00
|
|
|
d = DotProduct (dir, ent->v->velocity);
|
|
|
|
VectorScale (dir, d, ent->v->velocity);
|
|
|
|
// Con_Printf ("%5.1f %5.1f %5.1f\n",ent->v->velocity[0], ent->v->velocity[1], ent->v->velocity[2]);
|
2004-08-23 00:15:46 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
//
|
|
|
|
// if original velocity is against the original velocity, stop dead
|
|
|
|
// to avoid tiny occilations in sloping corners
|
|
|
|
//
|
2005-03-28 00:11:59 +00:00
|
|
|
if (DotProduct (ent->v->velocity, primal_velocity) <= 0)
|
2004-08-23 00:15:46 +00:00
|
|
|
{
|
2006-05-29 04:50:24 +00:00
|
|
|
VectorClear (ent->v->velocity);
|
2004-08-23 00:15:46 +00:00
|
|
|
return blocked;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
return blocked;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
/*
|
|
|
|
============
|
|
|
|
SV_AddGravity
|
|
|
|
|
|
|
|
============
|
|
|
|
*/
|
2010-07-11 10:53:13 +00:00
|
|
|
static void SV_AddGravity (edict_t *ent, float scale)
|
2004-08-23 00:15:46 +00:00
|
|
|
{
|
2005-06-04 04:20:20 +00:00
|
|
|
if (!scale && progstype != PROG_QW)
|
|
|
|
scale = 1;
|
2005-03-28 00:11:59 +00:00
|
|
|
ent->v->velocity[2] -= scale * sv_gravity.value/*movevars.gravity*/ * host_frametime;
|
2004-08-23 00:15:46 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
===============================================================================
|
|
|
|
|
|
|
|
PUSHMOVE
|
|
|
|
|
|
|
|
===============================================================================
|
|
|
|
*/
|
|
|
|
|
|
|
|
/*
|
|
|
|
============
|
|
|
|
SV_PushEntity
|
|
|
|
|
|
|
|
Does not change the entities velocity at all
|
|
|
|
============
|
|
|
|
*/
|
2010-07-11 10:53:13 +00:00
|
|
|
static trace_t SV_PushEntity (edict_t *ent, vec3_t push, unsigned int traceflags)
|
2004-08-23 00:15:46 +00:00
|
|
|
{
|
|
|
|
trace_t trace;
|
|
|
|
vec3_t end;
|
2006-02-17 19:54:47 +00:00
|
|
|
|
2005-03-28 00:11:59 +00:00
|
|
|
VectorAdd (ent->v->origin, push, end);
|
2004-08-23 00:15:46 +00:00
|
|
|
|
2009-11-04 21:16:50 +00:00
|
|
|
if ((int)ent->v->flags&FL_LAGGEDMOVE)
|
|
|
|
traceflags |= MOVE_LAGGED;
|
|
|
|
|
2005-03-28 00:11:59 +00:00
|
|
|
if (ent->v->movetype == MOVETYPE_FLYMISSILE)
|
2009-11-04 21:16:50 +00:00
|
|
|
trace = World_Move (&sv.world, ent->v->origin, ent->v->mins, ent->v->maxs, end, MOVE_MISSILE|traceflags, (wedict_t*)ent);
|
2005-03-28 00:11:59 +00:00
|
|
|
else if (ent->v->solid == SOLID_TRIGGER || ent->v->solid == SOLID_NOT)
|
2004-08-23 00:15:46 +00:00
|
|
|
// only clip against bmodels
|
2009-11-04 21:16:50 +00:00
|
|
|
trace = World_Move (&sv.world, ent->v->origin, ent->v->mins, ent->v->maxs, end, MOVE_NOMONSTERS|traceflags, (wedict_t*)ent);
|
2004-08-23 00:15:46 +00:00
|
|
|
else
|
2009-11-04 21:16:50 +00:00
|
|
|
trace = World_Move (&sv.world, ent->v->origin, ent->v->mins, ent->v->maxs, end, MOVE_NORMAL|traceflags, (wedict_t*)ent);
|
2006-02-17 19:54:47 +00:00
|
|
|
|
2004-08-23 00:15:46 +00:00
|
|
|
// if (trace.ent)
|
2005-03-28 00:11:59 +00:00
|
|
|
// VectorMA(trace.endpos, sv_impactpush.value, trace.plane.normal, ent->v->origin);
|
2004-08-23 00:15:46 +00:00
|
|
|
// else
|
2005-03-28 00:11:59 +00:00
|
|
|
VectorCopy (trace.endpos, ent->v->origin);
|
2009-11-04 21:16:50 +00:00
|
|
|
World_LinkEdict (&sv.world, (wedict_t*)ent, true);
|
2004-08-23 00:15:46 +00:00
|
|
|
|
|
|
|
if (trace.ent)
|
2006-02-17 19:54:47 +00:00
|
|
|
SV_Impact (ent, trace.ent);
|
2004-08-23 00:15:46 +00:00
|
|
|
|
|
|
|
return trace;
|
2006-02-17 19:54:47 +00:00
|
|
|
}
|
2004-08-23 00:15:46 +00:00
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
typedef struct
|
|
|
|
{
|
|
|
|
edict_t *ent;
|
|
|
|
vec3_t origin;
|
|
|
|
vec3_t angles;
|
|
|
|
// float deltayaw;
|
|
|
|
} pushed_t;
|
2010-07-11 10:53:13 +00:00
|
|
|
static pushed_t pushed[MAX_EDICTS], *pushed_p;
|
2004-08-23 00:15:46 +00:00
|
|
|
|
|
|
|
/*
|
|
|
|
============
|
|
|
|
SV_Push
|
|
|
|
|
|
|
|
Objects need to be moved back on a failed push,
|
|
|
|
otherwise riders would continue to slide.
|
|
|
|
============
|
|
|
|
*/
|
2010-07-11 10:53:13 +00:00
|
|
|
static qboolean SV_PushAngles (edict_t *pusher, vec3_t move, vec3_t amove)
|
2004-08-23 00:15:46 +00:00
|
|
|
{
|
|
|
|
int i, e;
|
|
|
|
edict_t *check, *block;
|
|
|
|
vec3_t mins, maxs;
|
|
|
|
float oldsolid;
|
|
|
|
pushed_t *p;
|
|
|
|
vec3_t org, org2, move2, forward, right, up;
|
|
|
|
|
|
|
|
pushed_p = pushed;
|
|
|
|
|
|
|
|
// find the bounding box
|
|
|
|
for (i=0 ; i<3 ; i++)
|
|
|
|
{
|
2005-03-28 00:11:59 +00:00
|
|
|
mins[i] = pusher->v->absmin[i] + move[i];
|
|
|
|
maxs[i] = pusher->v->absmax[i] + move[i];
|
2004-08-23 00:15:46 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
// we need this for pushing things later
|
2006-05-29 04:50:24 +00:00
|
|
|
VectorNegate (amove, org);
|
2004-08-23 00:15:46 +00:00
|
|
|
AngleVectors (org, forward, right, up);
|
|
|
|
|
|
|
|
// save the pusher's original position
|
|
|
|
pushed_p->ent = pusher;
|
2005-03-28 00:11:59 +00:00
|
|
|
VectorCopy (pusher->v->origin, pushed_p->origin);
|
|
|
|
VectorCopy (pusher->v->angles, pushed_p->angles);
|
2004-08-23 00:15:46 +00:00
|
|
|
// if (pusher->client)
|
|
|
|
// pushed_p->deltayaw = pusher->client->ps.pmove.delta_angles[YAW];
|
|
|
|
pushed_p++;
|
|
|
|
|
|
|
|
// move the pusher to it's final position
|
2005-03-28 00:11:59 +00:00
|
|
|
VectorAdd (pusher->v->origin, move, pusher->v->origin);
|
|
|
|
VectorAdd (pusher->v->angles, amove, pusher->v->angles);
|
2009-11-04 21:16:50 +00:00
|
|
|
World_LinkEdict (&sv.world, (wedict_t*)pusher, false);
|
2004-08-23 00:15:46 +00:00
|
|
|
|
|
|
|
// see if any solid entities are inside the final position
|
2009-11-04 21:16:50 +00:00
|
|
|
for (e = 1; e < sv.world.num_edicts; e++)
|
2004-08-23 00:15:46 +00:00
|
|
|
{
|
|
|
|
check = EDICT_NUM(svprogfuncs, e);
|
|
|
|
if (check->isfree)
|
|
|
|
continue;
|
2006-02-17 19:54:47 +00:00
|
|
|
|
2005-03-28 00:11:59 +00:00
|
|
|
if (check->v->movetype == MOVETYPE_PUSH
|
|
|
|
|| check->v->movetype == MOVETYPE_NONE
|
2011-02-27 15:01:56 +00:00
|
|
|
|| check->v->movetype == MOVETYPE_NOCLIP
|
|
|
|
|| check->v->movetype == MOVETYPE_ANGLENOCLIP)
|
2004-08-23 00:15:46 +00:00
|
|
|
continue;
|
|
|
|
|
|
|
|
#if 1
|
2005-03-28 00:11:59 +00:00
|
|
|
oldsolid = pusher->v->solid;
|
|
|
|
pusher->v->solid = SOLID_NOT;
|
2009-11-04 21:16:50 +00:00
|
|
|
block = (edict_t*)World_TestEntityPosition (&sv.world, (wedict_t*)check);
|
2005-03-28 00:11:59 +00:00
|
|
|
pusher->v->solid = oldsolid;
|
2004-08-23 00:15:46 +00:00
|
|
|
if (block)
|
|
|
|
continue;
|
|
|
|
#else
|
|
|
|
if (!check->area.prev)
|
|
|
|
continue; // not linked in anywhere
|
|
|
|
#endif
|
|
|
|
|
|
|
|
// if the entity is standing on the pusher, it will definitely be moved
|
2005-03-28 00:11:59 +00:00
|
|
|
if ( ! ( ((int)check->v->flags & FL_ONGROUND)
|
|
|
|
&& PROG_TO_EDICT(svprogfuncs, check->v->groundentity) == pusher) )
|
2004-08-23 00:15:46 +00:00
|
|
|
{
|
|
|
|
// see if the ent needs to be tested
|
2005-03-28 00:11:59 +00:00
|
|
|
if ( check->v->absmin[0] >= maxs[0]
|
|
|
|
|| check->v->absmin[1] >= maxs[1]
|
|
|
|
|| check->v->absmin[2] >= maxs[2]
|
|
|
|
|| check->v->absmax[0] <= mins[0]
|
|
|
|
|| check->v->absmax[1] <= mins[1]
|
|
|
|
|| check->v->absmax[2] <= mins[2] )
|
2004-08-23 00:15:46 +00:00
|
|
|
continue;
|
2006-02-17 19:54:47 +00:00
|
|
|
|
2004-08-23 00:15:46 +00:00
|
|
|
|
|
|
|
// see if the ent's bbox is inside the pusher's final position
|
2009-11-04 21:16:50 +00:00
|
|
|
if (!World_TestEntityPosition (&sv.world, (wedict_t*)check))
|
2004-08-23 00:15:46 +00:00
|
|
|
continue;
|
|
|
|
}
|
|
|
|
|
2005-03-28 00:11:59 +00:00
|
|
|
if ((pusher->v->movetype == MOVETYPE_PUSH) || (PROG_TO_EDICT(svprogfuncs, check->v->groundentity) == pusher))
|
2004-08-23 00:15:46 +00:00
|
|
|
{
|
|
|
|
// move this entity
|
|
|
|
pushed_p->ent = check;
|
2005-03-28 00:11:59 +00:00
|
|
|
VectorCopy (check->v->origin, pushed_p->origin);
|
|
|
|
VectorCopy (check->v->angles, pushed_p->angles);
|
2004-08-23 00:15:46 +00:00
|
|
|
pushed_p++;
|
|
|
|
|
2006-02-17 19:54:47 +00:00
|
|
|
// try moving the contacted entity
|
2005-03-28 00:11:59 +00:00
|
|
|
VectorAdd (check->v->origin, move, check->v->origin);
|
2004-08-23 00:15:46 +00:00
|
|
|
// if (check->client)
|
|
|
|
// { // FIXME: doesn't rotate monsters?
|
|
|
|
// check->client->ps.pmove.delta_angles[YAW] += amove[YAW];
|
|
|
|
// }
|
2005-03-28 00:11:59 +00:00
|
|
|
VectorAdd (check->v->angles, amove, check->v->angles);
|
2004-08-23 00:15:46 +00:00
|
|
|
|
|
|
|
// figure movement due to the pusher's amove
|
2005-03-28 00:11:59 +00:00
|
|
|
VectorSubtract (check->v->origin, pusher->v->origin, org);
|
2004-08-23 00:15:46 +00:00
|
|
|
org2[0] = DotProduct (org, forward);
|
2006-10-15 03:30:56 +00:00
|
|
|
org2[1] = -DotProduct (org, right);
|
2004-08-23 00:15:46 +00:00
|
|
|
org2[2] = DotProduct (org, up);
|
|
|
|
VectorSubtract (org2, org, move2);
|
2005-03-28 00:11:59 +00:00
|
|
|
VectorAdd (check->v->origin, move2, check->v->origin);
|
2004-08-23 00:15:46 +00:00
|
|
|
|
2006-02-17 19:54:47 +00:00
|
|
|
check->v->flags = (int)check->v->flags & ~FL_ONGROUND;
|
|
|
|
|
2004-08-23 00:15:46 +00:00
|
|
|
// may have pushed them off an edge
|
2005-03-28 00:11:59 +00:00
|
|
|
if (PROG_TO_EDICT(svprogfuncs, check->v->groundentity) != pusher)
|
|
|
|
check->v->groundentity = 0;
|
2004-08-23 00:15:46 +00:00
|
|
|
|
2009-11-04 21:16:50 +00:00
|
|
|
block = (edict_t*)World_TestEntityPosition (&sv.world, (wedict_t*)check);
|
2004-08-23 00:15:46 +00:00
|
|
|
if (!block)
|
|
|
|
{ // pushed ok
|
2009-11-04 21:16:50 +00:00
|
|
|
World_LinkEdict (&sv.world, (wedict_t*)check, false);
|
2004-08-23 00:15:46 +00:00
|
|
|
// impact?
|
|
|
|
continue;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
// if it is ok to leave in the old position, do it
|
|
|
|
// this is only relevent for riding entities, not pushed
|
|
|
|
// FIXME: this doesn't acount for rotation
|
2005-03-28 00:11:59 +00:00
|
|
|
VectorSubtract (check->v->origin, move, check->v->origin);
|
2009-11-04 21:16:50 +00:00
|
|
|
block = (edict_t*)World_TestEntityPosition (&sv.world, (wedict_t*)check);
|
2004-08-23 00:15:46 +00:00
|
|
|
if (!block)
|
|
|
|
{
|
|
|
|
pushed_p--;
|
|
|
|
continue;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
// if it is sitting on top. Do not block.
|
2005-03-28 00:11:59 +00:00
|
|
|
if (check->v->mins[0] == check->v->maxs[0])
|
2004-08-23 00:15:46 +00:00
|
|
|
{
|
2009-11-04 21:16:50 +00:00
|
|
|
World_LinkEdict (&sv.world, (wedict_t*)check, false);
|
2004-08-23 00:15:46 +00:00
|
|
|
continue;
|
|
|
|
}
|
2006-02-17 19:54:47 +00:00
|
|
|
|
2005-03-28 00:11:59 +00:00
|
|
|
// Con_Printf("Pusher hit %s\n", PR_GetString(svprogfuncs, check->v->classname));
|
|
|
|
if (pusher->v->blocked)
|
2004-08-23 00:15:46 +00:00
|
|
|
{
|
|
|
|
pr_global_struct->self = EDICT_TO_PROG(svprogfuncs, pusher);
|
|
|
|
pr_global_struct->other = EDICT_TO_PROG(svprogfuncs, check);
|
2007-09-02 19:55:17 +00:00
|
|
|
#ifdef VM_Q1
|
|
|
|
if (svs.gametype == GT_Q1QVM)
|
|
|
|
Q1QVM_Blocked();
|
|
|
|
else
|
|
|
|
#endif
|
|
|
|
PR_ExecuteProgram (svprogfuncs, pusher->v->blocked);
|
2004-08-23 00:15:46 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
// move back any entities we already moved
|
|
|
|
// go backwards, so if the same entity was pushed
|
|
|
|
// twice, it goes back to the original position
|
|
|
|
for (p=pushed_p-1 ; p>=pushed ; p--)
|
|
|
|
{
|
2005-03-28 00:11:59 +00:00
|
|
|
VectorCopy (p->origin, p->ent->v->origin);
|
|
|
|
VectorCopy (p->angles, p->ent->v->angles);
|
2004-08-23 00:15:46 +00:00
|
|
|
// if (p->ent->client)
|
|
|
|
// {
|
|
|
|
// p->ent->client->ps.pmove.delta_angles[YAW] = p->deltayaw;
|
|
|
|
// }
|
2009-11-04 21:16:50 +00:00
|
|
|
World_LinkEdict (&sv.world, (wedict_t*)p->ent, false);
|
2004-08-23 00:15:46 +00:00
|
|
|
}
|
|
|
|
return false;
|
|
|
|
}
|
|
|
|
|
|
|
|
//FIXME: is there a better way to handle this?
|
|
|
|
// see if anything we moved has touched a trigger
|
|
|
|
for (p=pushed_p-1 ; p>=pushed ; p--)
|
2009-11-04 21:16:50 +00:00
|
|
|
World_TouchLinks (&sv.world, (wedict_t*)p->ent, sv.world.areanodes );
|
2004-08-23 00:15:46 +00:00
|
|
|
|
|
|
|
return true;
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
============
|
|
|
|
SV_Push
|
|
|
|
|
|
|
|
============
|
|
|
|
*/
|
2010-07-11 10:53:13 +00:00
|
|
|
static qboolean SV_Push (edict_t *pusher, vec3_t move, vec3_t amove)
|
2004-08-23 00:15:46 +00:00
|
|
|
{
|
|
|
|
int i, e;
|
|
|
|
edict_t *check, *block;
|
|
|
|
vec3_t mins, maxs;
|
|
|
|
vec3_t pushorig;
|
|
|
|
int num_moved;
|
|
|
|
edict_t *moved_edict[MAX_EDICTS];
|
|
|
|
vec3_t moved_from[MAX_EDICTS];
|
|
|
|
float oldsolid;
|
|
|
|
|
|
|
|
if (amove[0] || amove[1] || amove[2])
|
|
|
|
{
|
|
|
|
return SV_PushAngles(pusher, move, amove);
|
|
|
|
}
|
|
|
|
|
|
|
|
for (i=0 ; i<3 ; i++)
|
|
|
|
{
|
2005-03-28 00:11:59 +00:00
|
|
|
mins[i] = pusher->v->absmin[i] + move[i];
|
|
|
|
maxs[i] = pusher->v->absmax[i] + move[i];
|
2004-08-23 00:15:46 +00:00
|
|
|
}
|
|
|
|
|
2005-03-28 00:11:59 +00:00
|
|
|
VectorCopy (pusher->v->origin, pushorig);
|
2006-02-17 19:54:47 +00:00
|
|
|
|
2004-08-23 00:15:46 +00:00
|
|
|
// move the pusher to it's final position
|
|
|
|
|
2005-03-28 00:11:59 +00:00
|
|
|
VectorAdd (pusher->v->origin, move, pusher->v->origin);
|
2009-11-04 21:16:50 +00:00
|
|
|
World_LinkEdict (&sv.world, (wedict_t*)pusher, false);
|
2004-08-23 00:15:46 +00:00
|
|
|
|
|
|
|
// see if any solid entities are inside the final position
|
|
|
|
num_moved = 0;
|
2009-11-04 21:16:50 +00:00
|
|
|
for (e=1 ; e<sv.world.num_edicts ; e++)
|
2004-08-23 00:15:46 +00:00
|
|
|
{
|
|
|
|
check = EDICT_NUM(svprogfuncs, e);
|
|
|
|
if (check->isfree)
|
|
|
|
continue;
|
2005-03-28 00:11:59 +00:00
|
|
|
if (check->v->movetype == MOVETYPE_PUSH
|
|
|
|
|| check->v->movetype == MOVETYPE_NONE
|
|
|
|
|| check->v->movetype == MOVETYPE_FOLLOW
|
2011-02-27 15:01:56 +00:00
|
|
|
|| check->v->movetype == MOVETYPE_NOCLIP
|
|
|
|
|| check->v->movetype == MOVETYPE_ANGLENOCLIP)
|
2004-08-23 00:15:46 +00:00
|
|
|
continue;
|
|
|
|
|
|
|
|
// if the entity is standing on the pusher, it will definately be moved
|
2005-03-28 00:11:59 +00:00
|
|
|
if ( ! ( ((int)check->v->flags & FL_ONGROUND)
|
2006-02-17 19:54:47 +00:00
|
|
|
&&
|
2005-03-28 00:11:59 +00:00
|
|
|
PROG_TO_EDICT(svprogfuncs, check->v->groundentity) == pusher) )
|
2004-08-23 00:15:46 +00:00
|
|
|
{
|
2005-03-28 00:11:59 +00:00
|
|
|
if ( check->v->absmin[0] >= maxs[0]
|
|
|
|
|| check->v->absmin[1] >= maxs[1]
|
|
|
|
|| check->v->absmin[2] >= maxs[2]
|
|
|
|
|| check->v->absmax[0] <= mins[0]
|
|
|
|
|| check->v->absmax[1] <= mins[1]
|
|
|
|
|| check->v->absmax[2] <= mins[2] )
|
2004-08-23 00:15:46 +00:00
|
|
|
continue;
|
|
|
|
|
|
|
|
// see if the ent's bbox is inside the pusher's final position
|
2009-11-04 21:16:50 +00:00
|
|
|
if (!World_TestEntityPosition (&sv.world, (wedict_t*)check))
|
2004-08-23 00:15:46 +00:00
|
|
|
continue;
|
|
|
|
}
|
|
|
|
|
2010-07-11 02:22:39 +00:00
|
|
|
oldsolid = pusher->v->solid;
|
|
|
|
pusher->v->solid = SOLID_NOT;
|
|
|
|
block = (edict_t*)World_TestEntityPosition (&sv.world, (wedict_t*)check);
|
|
|
|
pusher->v->solid = oldsolid;
|
|
|
|
if (block)
|
|
|
|
continue;
|
|
|
|
|
2005-03-28 00:11:59 +00:00
|
|
|
VectorCopy (check->v->origin, moved_from[num_moved]);
|
2004-08-23 00:15:46 +00:00
|
|
|
moved_edict[num_moved] = check;
|
|
|
|
num_moved++;
|
|
|
|
|
2006-04-06 20:47:18 +00:00
|
|
|
// check->v->flags = (int)check->v->flags & ~FL_ONGROUND;
|
2006-02-17 19:54:47 +00:00
|
|
|
|
|
|
|
// try moving the contacted entity
|
2005-03-28 00:11:59 +00:00
|
|
|
VectorAdd (check->v->origin, move, check->v->origin);
|
2009-11-04 21:16:50 +00:00
|
|
|
block = (edict_t*)World_TestEntityPosition (&sv.world, (wedict_t*)check);
|
2004-08-23 00:15:46 +00:00
|
|
|
if (!block)
|
|
|
|
{ // pushed ok
|
2009-11-04 21:16:50 +00:00
|
|
|
World_LinkEdict (&sv.world, (wedict_t*)check, false);
|
2004-08-23 00:15:46 +00:00
|
|
|
continue;
|
|
|
|
}
|
|
|
|
|
|
|
|
// if it is ok to leave in the old position, do it
|
2005-03-28 00:11:59 +00:00
|
|
|
VectorSubtract (check->v->origin, move, check->v->origin);
|
2009-11-04 21:16:50 +00:00
|
|
|
block = (edict_t*)World_TestEntityPosition (&sv.world, (wedict_t*)check);
|
2004-08-23 00:15:46 +00:00
|
|
|
if (!block)
|
|
|
|
{
|
2006-09-17 00:59:22 +00:00
|
|
|
//if leaving it where it was, allow it to drop to the floor again (useful for plats that move downward)
|
|
|
|
check->v->flags = (int)check->v->flags & ~FL_ONGROUND;
|
|
|
|
|
2004-08-23 00:15:46 +00:00
|
|
|
num_moved--;
|
|
|
|
continue;
|
|
|
|
}
|
|
|
|
|
|
|
|
// if it is still inside the pusher, block
|
2005-03-28 00:11:59 +00:00
|
|
|
if (check->v->mins[0] == check->v->maxs[0])
|
2004-08-23 00:15:46 +00:00
|
|
|
{
|
2009-11-04 21:16:50 +00:00
|
|
|
World_LinkEdict (&sv.world, (wedict_t*)check, false);
|
2004-08-23 00:15:46 +00:00
|
|
|
continue;
|
|
|
|
}
|
2005-03-28 00:11:59 +00:00
|
|
|
if (check->v->solid == SOLID_NOT || check->v->solid == SOLID_TRIGGER)
|
2004-08-23 00:15:46 +00:00
|
|
|
{ // corpse
|
2005-03-28 00:11:59 +00:00
|
|
|
check->v->mins[0] = check->v->mins[1] = 0;
|
|
|
|
VectorCopy (check->v->mins, check->v->maxs);
|
2009-11-04 21:16:50 +00:00
|
|
|
World_LinkEdict (&sv.world, (wedict_t*)check, false);
|
2004-08-23 00:15:46 +00:00
|
|
|
continue;
|
|
|
|
}
|
2006-02-17 19:54:47 +00:00
|
|
|
|
2005-03-28 00:11:59 +00:00
|
|
|
VectorCopy (pushorig, pusher->v->origin);
|
2009-11-04 21:16:50 +00:00
|
|
|
World_LinkEdict (&sv.world, (wedict_t*)pusher, false);
|
2004-08-23 00:15:46 +00:00
|
|
|
|
|
|
|
// if the pusher has a "blocked" function, call it
|
|
|
|
// otherwise, just stay in place until the obstacle is gone
|
2005-03-28 00:11:59 +00:00
|
|
|
if (pusher->v->blocked)
|
2004-08-23 00:15:46 +00:00
|
|
|
{
|
|
|
|
pr_global_struct->self = EDICT_TO_PROG(svprogfuncs, pusher);
|
|
|
|
pr_global_struct->other = EDICT_TO_PROG(svprogfuncs, check);
|
2007-09-02 19:55:17 +00:00
|
|
|
#ifdef VM_Q1
|
|
|
|
if (svs.gametype == GT_Q1QVM)
|
|
|
|
Q1QVM_Blocked();
|
|
|
|
else
|
|
|
|
#endif
|
|
|
|
PR_ExecuteProgram (svprogfuncs, pusher->v->blocked);
|
2004-08-23 00:15:46 +00:00
|
|
|
}
|
2006-02-17 19:54:47 +00:00
|
|
|
|
2004-08-23 00:15:46 +00:00
|
|
|
// move back any entities we already moved
|
|
|
|
for (i=0 ; i<num_moved ; i++)
|
|
|
|
{
|
2005-03-28 00:11:59 +00:00
|
|
|
VectorCopy (moved_from[i], moved_edict[i]->v->origin);
|
2009-11-04 21:16:50 +00:00
|
|
|
World_LinkEdict (&sv.world, (wedict_t*)moved_edict[i], false);
|
2004-08-23 00:15:46 +00:00
|
|
|
}
|
|
|
|
return false;
|
|
|
|
}
|
|
|
|
|
|
|
|
return true;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
/*
|
|
|
|
============
|
|
|
|
SV_PushMove
|
|
|
|
|
|
|
|
============
|
|
|
|
*/
|
2010-07-11 10:53:13 +00:00
|
|
|
static void SV_PushMove (edict_t *pusher, float movetime)
|
2004-08-23 00:15:46 +00:00
|
|
|
{
|
|
|
|
int i;
|
|
|
|
vec3_t move;
|
|
|
|
vec3_t amove;
|
|
|
|
|
2005-03-28 00:11:59 +00:00
|
|
|
if (!pusher->v->velocity[0] && !pusher->v->velocity[1] && !pusher->v->velocity[2]
|
|
|
|
&& !pusher->v->avelocity[0] && !pusher->v->avelocity[1] && !pusher->v->avelocity[2])
|
2004-08-23 00:15:46 +00:00
|
|
|
{
|
2005-03-28 00:11:59 +00:00
|
|
|
pusher->v->ltime += movetime;
|
2004-08-23 00:15:46 +00:00
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
|
|
|
for (i=0 ; i<3 ; i++)
|
|
|
|
{
|
2005-03-28 00:11:59 +00:00
|
|
|
move[i] = pusher->v->velocity[i] * movetime;
|
|
|
|
amove[i] = pusher->v->avelocity[i] * movetime;
|
2004-08-23 00:15:46 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
if (SV_Push (pusher, move, amove))
|
2005-03-28 00:11:59 +00:00
|
|
|
pusher->v->ltime += movetime;
|
2004-08-23 00:15:46 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
/*
|
|
|
|
================
|
|
|
|
SV_Physics_Pusher
|
|
|
|
|
|
|
|
================
|
|
|
|
*/
|
2010-07-11 10:53:13 +00:00
|
|
|
static void SV_Physics_Pusher (edict_t *ent)
|
2004-08-23 00:15:46 +00:00
|
|
|
{
|
|
|
|
float thinktime;
|
|
|
|
float oldltime;
|
|
|
|
float movetime;
|
|
|
|
vec3_t oldorg, move;
|
|
|
|
vec3_t oldang, amove;
|
|
|
|
float l;
|
|
|
|
|
2005-03-28 00:11:59 +00:00
|
|
|
oldltime = ent->v->ltime;
|
2006-02-17 19:54:47 +00:00
|
|
|
|
2005-03-28 00:11:59 +00:00
|
|
|
thinktime = ent->v->nextthink;
|
|
|
|
if (thinktime < ent->v->ltime + host_frametime)
|
2004-08-23 00:15:46 +00:00
|
|
|
{
|
2005-03-28 00:11:59 +00:00
|
|
|
movetime = thinktime - ent->v->ltime;
|
2004-08-23 00:15:46 +00:00
|
|
|
if (movetime < 0)
|
|
|
|
movetime = 0;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
movetime = host_frametime;
|
|
|
|
|
|
|
|
if (movetime)
|
|
|
|
{
|
2005-03-28 00:11:59 +00:00
|
|
|
SV_PushMove (ent, movetime); // advances ent->v->ltime if not blocked
|
2004-08-23 00:15:46 +00:00
|
|
|
}
|
2006-02-17 19:54:47 +00:00
|
|
|
|
2005-03-28 00:11:59 +00:00
|
|
|
if (thinktime > oldltime && thinktime <= ent->v->ltime)
|
2004-08-23 00:15:46 +00:00
|
|
|
{
|
2005-03-28 00:11:59 +00:00
|
|
|
VectorCopy (ent->v->origin, oldorg);
|
|
|
|
VectorCopy (ent->v->angles, oldang);
|
|
|
|
ent->v->nextthink = 0;
|
2009-11-04 21:16:50 +00:00
|
|
|
pr_global_struct->time = sv.world.physicstime;
|
2004-08-23 00:15:46 +00:00
|
|
|
pr_global_struct->self = EDICT_TO_PROG(svprogfuncs, ent);
|
2009-11-04 21:16:50 +00:00
|
|
|
pr_global_struct->other = EDICT_TO_PROG(svprogfuncs, sv.world.edicts);
|
2007-09-02 19:55:17 +00:00
|
|
|
#ifdef VM_Q1
|
|
|
|
if (svs.gametype == GT_Q1QVM)
|
|
|
|
Q1QVM_Think();
|
|
|
|
else
|
|
|
|
#endif
|
|
|
|
PR_ExecuteProgram (svprogfuncs, ent->v->think);
|
2004-08-23 00:15:46 +00:00
|
|
|
if (ent->isfree)
|
|
|
|
return;
|
2005-03-28 00:11:59 +00:00
|
|
|
VectorSubtract (ent->v->origin, oldorg, move);
|
|
|
|
VectorSubtract (ent->v->angles, oldang, amove);
|
2004-08-23 00:15:46 +00:00
|
|
|
|
|
|
|
l = Length(move)+Length(amove);
|
|
|
|
if (l > 1.0/64)
|
|
|
|
{
|
|
|
|
// Con_Printf ("**** snap: %f\n", Length (l));
|
2005-03-28 00:11:59 +00:00
|
|
|
VectorCopy (oldorg, ent->v->origin);
|
Fixes, workarounds, and breakages. Hexen2 should work much better (-hexen2 says no mission pack, -portals says h2mp). Started working on splitting bigcoords per client, far too much work still to go on that. Removed gl_ztrick entirely. Enabled csprogs download by default. Added client support for fitzquake's 666 protocol, needs testing, some cleanup for dp protocols too, no server support, couldn't selectively enable it anyway. Now attempting to cache shadow meshes for explosions and stuff. Played with lightmaps a little, should potentially run a little faster on certain (intel?) cards. Tweeked npfte a little to try to avoid deadlocks and crashes. Fixed sky worldspawn parsing. Added h2mp's model format. Fixed baseline issue in q2 client, made servers generate q2 baselines. MOVETYPE_PUSH will not rotate extra if rotation is forced. Made status command show allowed client types. Changed lighting on weapons - should now be shaded.
git-svn-id: https://svn.code.sf.net/p/fteqw/code/branches/wip@3572 fc73d0e0-1445-4013-8a0c-d673dee63da5
2010-08-11 03:36:31 +00:00
|
|
|
VectorCopy (oldang, ent->v->angles);
|
2004-08-23 00:15:46 +00:00
|
|
|
SV_Push (ent, move, amove);
|
|
|
|
}
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2004-10-10 06:32:29 +00:00
|
|
|
/*
|
|
|
|
=============
|
|
|
|
SV_Physics_Follow
|
|
|
|
|
|
|
|
Entities that are "stuck" to another entity
|
|
|
|
=============
|
|
|
|
*/
|
2010-07-11 10:53:13 +00:00
|
|
|
static void SV_Physics_Follow (edict_t *ent)
|
2004-10-10 06:32:29 +00:00
|
|
|
{
|
|
|
|
vec3_t vf, vr, vu, angles, v;
|
|
|
|
edict_t *e;
|
|
|
|
|
|
|
|
// regular thinking
|
|
|
|
if (!SV_RunThink (ent))
|
|
|
|
return;
|
|
|
|
|
|
|
|
// LordHavoc: implemented rotation on MOVETYPE_FOLLOW objects
|
2005-03-28 00:11:59 +00:00
|
|
|
e = PROG_TO_EDICT(svprogfuncs, ent->v->aiment);
|
2007-09-02 19:55:17 +00:00
|
|
|
if (e->v->angles[0] == ent->xv->punchangle[0] && e->v->angles[1] == ent->xv->punchangle[1] && e->v->angles[2] == ent->xv->punchangle[2])
|
2004-10-10 06:32:29 +00:00
|
|
|
{
|
|
|
|
// quick case for no rotation
|
2005-03-28 00:11:59 +00:00
|
|
|
VectorAdd(e->v->origin, ent->v->view_ofs, ent->v->origin);
|
2004-10-10 06:32:29 +00:00
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
2007-09-02 19:55:17 +00:00
|
|
|
angles[0] = -ent->xv->punchangle[0];
|
|
|
|
angles[1] = ent->xv->punchangle[1];
|
|
|
|
angles[2] = ent->xv->punchangle[2];
|
2004-10-10 06:32:29 +00:00
|
|
|
AngleVectors (angles, vf, vr, vu);
|
2005-03-28 00:11:59 +00:00
|
|
|
v[0] = ent->v->view_ofs[0] * vf[0] + ent->v->view_ofs[1] * vr[0] + ent->v->view_ofs[2] * vu[0];
|
|
|
|
v[1] = ent->v->view_ofs[0] * vf[1] + ent->v->view_ofs[1] * vr[1] + ent->v->view_ofs[2] * vu[1];
|
|
|
|
v[2] = ent->v->view_ofs[0] * vf[2] + ent->v->view_ofs[1] * vr[2] + ent->v->view_ofs[2] * vu[2];
|
|
|
|
angles[0] = -e->v->angles[0];
|
|
|
|
angles[1] = e->v->angles[1];
|
|
|
|
angles[2] = e->v->angles[2];
|
2004-10-10 06:32:29 +00:00
|
|
|
AngleVectors (angles, vf, vr, vu);
|
2005-03-28 00:11:59 +00:00
|
|
|
ent->v->origin[0] = v[0] * vf[0] + v[1] * vf[1] + v[2] * vf[2] + e->v->origin[0];
|
|
|
|
ent->v->origin[1] = v[0] * vr[0] + v[1] * vr[1] + v[2] * vr[2] + e->v->origin[1];
|
|
|
|
ent->v->origin[2] = v[0] * vu[0] + v[1] * vu[1] + v[2] * vu[2] + e->v->origin[2];
|
2004-10-10 06:32:29 +00:00
|
|
|
}
|
2005-03-28 00:11:59 +00:00
|
|
|
VectorAdd (e->v->angles, ent->v->v_angle, ent->v->angles);
|
2009-11-04 21:16:50 +00:00
|
|
|
World_LinkEdict (&sv.world, (wedict_t*)ent, true);
|
2004-10-10 06:32:29 +00:00
|
|
|
}
|
|
|
|
|
2004-08-23 00:15:46 +00:00
|
|
|
/*
|
|
|
|
=============
|
|
|
|
SV_Physics_Noclip
|
|
|
|
|
|
|
|
A moving object that doesn't obey physics
|
|
|
|
=============
|
|
|
|
*/
|
2010-07-11 10:53:13 +00:00
|
|
|
static void SV_Physics_Noclip (edict_t *ent)
|
2004-08-23 00:15:46 +00:00
|
|
|
{
|
|
|
|
// regular thinking
|
|
|
|
if (!SV_RunThink (ent))
|
|
|
|
return;
|
2006-02-17 19:54:47 +00:00
|
|
|
|
2005-03-28 00:11:59 +00:00
|
|
|
VectorMA (ent->v->angles, host_frametime, ent->v->avelocity, ent->v->angles);
|
|
|
|
VectorMA (ent->v->origin, host_frametime, ent->v->velocity, ent->v->origin);
|
2004-08-23 00:15:46 +00:00
|
|
|
|
2009-11-04 21:16:50 +00:00
|
|
|
World_LinkEdict (&sv.world, (wedict_t*)ent, false);
|
2004-08-23 00:15:46 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
==============================================================================
|
|
|
|
|
|
|
|
TOSS / BOUNCE
|
|
|
|
|
|
|
|
==============================================================================
|
|
|
|
*/
|
|
|
|
|
|
|
|
/*
|
|
|
|
=============
|
|
|
|
SV_CheckWaterTransition
|
|
|
|
|
|
|
|
=============
|
|
|
|
*/
|
2010-07-11 10:53:13 +00:00
|
|
|
static void SV_CheckWaterTransition (edict_t *ent)
|
2004-08-23 00:15:46 +00:00
|
|
|
{
|
|
|
|
int cont;
|
|
|
|
|
2009-11-04 21:16:50 +00:00
|
|
|
cont = World_PointContents (&sv.world, ent->v->origin);
|
2004-08-23 00:15:46 +00:00
|
|
|
|
2007-10-05 18:08:47 +00:00
|
|
|
//needs to be q1 progs compatible
|
2004-08-23 00:15:46 +00:00
|
|
|
if (cont & FTECONTENTS_LAVA)
|
|
|
|
cont = Q1CONTENTS_LAVA;
|
|
|
|
else if (cont & FTECONTENTS_SLIME)
|
|
|
|
cont = Q1CONTENTS_SLIME;
|
|
|
|
else if (cont & FTECONTENTS_WATER)
|
|
|
|
cont = Q1CONTENTS_WATER;
|
|
|
|
else
|
|
|
|
cont = Q1CONTENTS_EMPTY;
|
|
|
|
|
2005-03-28 00:11:59 +00:00
|
|
|
if (!ent->v->watertype)
|
2004-08-23 00:15:46 +00:00
|
|
|
{ // just spawned here
|
2005-03-28 00:11:59 +00:00
|
|
|
ent->v->watertype = cont;
|
|
|
|
ent->v->waterlevel = 1;
|
2004-08-23 00:15:46 +00:00
|
|
|
return;
|
|
|
|
}
|
2006-02-17 19:54:47 +00:00
|
|
|
|
2004-08-23 00:15:46 +00:00
|
|
|
if (cont <= Q1CONTENTS_WATER)
|
|
|
|
{
|
2010-12-18 17:02:47 +00:00
|
|
|
if (ent->v->watertype == Q1CONTENTS_EMPTY && *sv_sound_watersplash.string)
|
2004-08-23 00:15:46 +00:00
|
|
|
{ // just crossed into water
|
2010-12-18 17:02:47 +00:00
|
|
|
SVQ1_StartSound (ent, 0, sv_sound_watersplash.string, 255, 1, 0);
|
2006-02-17 19:54:47 +00:00
|
|
|
}
|
2005-03-28 00:11:59 +00:00
|
|
|
ent->v->watertype = cont;
|
|
|
|
ent->v->waterlevel = 1;
|
2004-08-23 00:15:46 +00:00
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
2010-12-18 17:02:47 +00:00
|
|
|
if (ent->v->watertype != Q1CONTENTS_EMPTY && *sv_sound_watersplash.string)
|
2004-08-23 00:15:46 +00:00
|
|
|
{ // just crossed into open
|
2010-12-18 17:02:47 +00:00
|
|
|
SVQ1_StartSound (ent, 0, sv_sound_watersplash.string, 255, 1, 0);
|
2006-02-17 19:54:47 +00:00
|
|
|
}
|
2005-03-28 00:11:59 +00:00
|
|
|
ent->v->watertype = Q1CONTENTS_EMPTY;
|
|
|
|
ent->v->waterlevel = cont;
|
2004-08-23 00:15:46 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
=============
|
|
|
|
SV_Physics_Toss
|
|
|
|
|
|
|
|
Toss, bounce, and fly movement. When onground, do nothing.
|
|
|
|
=============
|
|
|
|
*/
|
2010-07-11 10:53:13 +00:00
|
|
|
static void SV_Physics_Toss (edict_t *ent)
|
2004-08-23 00:15:46 +00:00
|
|
|
{
|
|
|
|
trace_t trace;
|
|
|
|
vec3_t move;
|
|
|
|
float backoff;
|
|
|
|
|
2005-05-15 18:49:04 +00:00
|
|
|
vec3_t temporg;
|
|
|
|
|
2004-08-23 00:15:46 +00:00
|
|
|
SV_CheckVelocity (ent);
|
|
|
|
|
|
|
|
// regular thinking
|
|
|
|
if (!SV_RunThink (ent))
|
|
|
|
return;
|
|
|
|
|
|
|
|
// if onground, return without moving
|
2005-03-28 00:11:59 +00:00
|
|
|
if ( ((int)ent->v->flags & FL_ONGROUND) )
|
2006-02-17 19:54:47 +00:00
|
|
|
{
|
2006-02-17 19:59:43 +00:00
|
|
|
if (ent->v->velocity[2] >= (1.0f/32.0f))
|
2006-02-17 19:54:47 +00:00
|
|
|
ent->v->flags = (int)ent->v->flags & ~FL_ONGROUND;
|
2006-02-17 19:59:43 +00:00
|
|
|
else
|
2006-02-17 19:54:47 +00:00
|
|
|
{
|
|
|
|
if (sv_gameplayfix_noairborncorpse.value)
|
|
|
|
{
|
|
|
|
edict_t *onent;
|
|
|
|
onent = PROG_TO_EDICT(svprogfuncs, ent->v->groundentity);
|
|
|
|
if (!onent->isfree)
|
|
|
|
return; //don't drop if our fround is still valid
|
|
|
|
}
|
|
|
|
else
|
|
|
|
return; //don't drop, even if the item we were on was removed (certain dm maps do this for q3 style stuff).
|
|
|
|
}
|
|
|
|
}
|
2004-08-23 00:15:46 +00:00
|
|
|
|
|
|
|
// add gravity
|
2005-03-28 00:11:59 +00:00
|
|
|
if (ent->v->movetype != MOVETYPE_FLY
|
|
|
|
&& ent->v->movetype != MOVETYPE_FLYMISSILE
|
|
|
|
&& ent->v->movetype != MOVETYPE_BOUNCEMISSILE
|
2010-08-11 23:55:35 +00:00
|
|
|
&& ent->v->movetype != MOVETYPE_H2SWIM)
|
2004-08-23 00:15:46 +00:00
|
|
|
SV_AddGravity (ent, 1.0);
|
|
|
|
|
|
|
|
// move angles
|
2005-03-28 00:11:59 +00:00
|
|
|
VectorMA (ent->v->angles, host_frametime, ent->v->avelocity, ent->v->angles);
|
2004-08-23 00:15:46 +00:00
|
|
|
|
|
|
|
// move origin
|
2005-03-28 00:11:59 +00:00
|
|
|
VectorScale (ent->v->velocity, host_frametime, move);
|
2005-05-15 18:49:04 +00:00
|
|
|
VectorCopy(ent->v->origin, temporg);
|
|
|
|
VectorCopy(temporg, ent->v->origin);
|
2009-11-04 21:16:50 +00:00
|
|
|
|
|
|
|
trace = SV_PushEntity (ent, move, (sv_antilag.ival==2)?MOVE_LAGGED:0);
|
2005-07-16 00:53:08 +00:00
|
|
|
|
2005-05-15 18:49:04 +00:00
|
|
|
if (trace.allsolid)
|
|
|
|
trace.fraction = 0;
|
2004-08-23 00:15:46 +00:00
|
|
|
if (trace.fraction == 1)
|
|
|
|
return;
|
|
|
|
if (ent->isfree)
|
|
|
|
return;
|
|
|
|
|
|
|
|
VectorCopy(trace.endpos, move);
|
2006-02-17 19:54:47 +00:00
|
|
|
|
2005-03-28 00:11:59 +00:00
|
|
|
if (ent->v->movetype == MOVETYPE_BOUNCE)
|
2004-08-23 00:15:46 +00:00
|
|
|
backoff = 1.5;
|
2005-03-28 00:11:59 +00:00
|
|
|
else if (ent->v->movetype == MOVETYPE_BOUNCEMISSILE)
|
Fixes, workarounds, and breakages. Hexen2 should work much better (-hexen2 says no mission pack, -portals says h2mp). Started working on splitting bigcoords per client, far too much work still to go on that. Removed gl_ztrick entirely. Enabled csprogs download by default. Added client support for fitzquake's 666 protocol, needs testing, some cleanup for dp protocols too, no server support, couldn't selectively enable it anyway. Now attempting to cache shadow meshes for explosions and stuff. Played with lightmaps a little, should potentially run a little faster on certain (intel?) cards. Tweeked npfte a little to try to avoid deadlocks and crashes. Fixed sky worldspawn parsing. Added h2mp's model format. Fixed baseline issue in q2 client, made servers generate q2 baselines. MOVETYPE_PUSH will not rotate extra if rotation is forced. Made status command show allowed client types. Changed lighting on weapons - should now be shaded.
git-svn-id: https://svn.code.sf.net/p/fteqw/code/branches/wip@3572 fc73d0e0-1445-4013-8a0c-d673dee63da5
2010-08-11 03:36:31 +00:00
|
|
|
{
|
|
|
|
// if (progstype == PROG_H2 && ent->v->solid == SOLID_PHASEH2 && ((int)((wedict_t*)trace.ent)->v->flags & (FL_MONSTER|FL_CLIENT)))
|
|
|
|
// backoff = 0;
|
|
|
|
// else
|
|
|
|
backoff = 2;
|
|
|
|
}
|
2004-08-23 00:15:46 +00:00
|
|
|
else
|
|
|
|
backoff = 1;
|
|
|
|
|
Fixes, workarounds, and breakages. Hexen2 should work much better (-hexen2 says no mission pack, -portals says h2mp). Started working on splitting bigcoords per client, far too much work still to go on that. Removed gl_ztrick entirely. Enabled csprogs download by default. Added client support for fitzquake's 666 protocol, needs testing, some cleanup for dp protocols too, no server support, couldn't selectively enable it anyway. Now attempting to cache shadow meshes for explosions and stuff. Played with lightmaps a little, should potentially run a little faster on certain (intel?) cards. Tweeked npfte a little to try to avoid deadlocks and crashes. Fixed sky worldspawn parsing. Added h2mp's model format. Fixed baseline issue in q2 client, made servers generate q2 baselines. MOVETYPE_PUSH will not rotate extra if rotation is forced. Made status command show allowed client types. Changed lighting on weapons - should now be shaded.
git-svn-id: https://svn.code.sf.net/p/fteqw/code/branches/wip@3572 fc73d0e0-1445-4013-8a0c-d673dee63da5
2010-08-11 03:36:31 +00:00
|
|
|
if (backoff)
|
|
|
|
ClipVelocity (ent->v->velocity, trace.plane.normal, ent->v->velocity, backoff);
|
2004-08-23 00:15:46 +00:00
|
|
|
|
|
|
|
|
|
|
|
// stop if on ground
|
2005-03-28 00:11:59 +00:00
|
|
|
if ((trace.plane.normal[2] > 0.7) && (ent->v->movetype != MOVETYPE_BOUNCEMISSILE))
|
2006-02-17 19:54:47 +00:00
|
|
|
{
|
2005-03-28 00:11:59 +00:00
|
|
|
if (ent->v->velocity[2] < 60 || ent->v->movetype != MOVETYPE_BOUNCE )
|
2004-08-23 00:15:46 +00:00
|
|
|
{
|
2005-03-28 00:11:59 +00:00
|
|
|
ent->v->flags = (int)ent->v->flags | FL_ONGROUND;
|
|
|
|
ent->v->groundentity = EDICT_TO_PROG(svprogfuncs, trace.ent);
|
2006-05-29 04:50:24 +00:00
|
|
|
VectorClear (ent->v->velocity);
|
|
|
|
VectorClear (ent->v->avelocity);
|
2004-08-23 00:15:46 +00:00
|
|
|
}
|
|
|
|
}
|
2006-02-17 19:54:47 +00:00
|
|
|
|
2004-08-23 00:15:46 +00:00
|
|
|
// check for in water
|
|
|
|
SV_CheckWaterTransition (ent);
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
===============================================================================
|
|
|
|
|
|
|
|
STEPPING MOVEMENT
|
|
|
|
|
|
|
|
===============================================================================
|
|
|
|
*/
|
|
|
|
|
|
|
|
/*
|
|
|
|
=============
|
|
|
|
SV_Physics_Step
|
|
|
|
|
|
|
|
Monsters freefall when they don't have a ground entity, otherwise
|
|
|
|
all movement is done with discrete steps.
|
|
|
|
|
|
|
|
This is also used for objects that have become still on the ground, but
|
|
|
|
will fall if the floor is pulled out from under them.
|
|
|
|
FIXME: is this true?
|
|
|
|
=============
|
|
|
|
*/
|
2010-07-11 10:53:13 +00:00
|
|
|
static void SV_Physics_Step (edict_t *ent)
|
2004-08-23 00:15:46 +00:00
|
|
|
{
|
|
|
|
qboolean hitsound;
|
2010-08-16 02:03:02 +00:00
|
|
|
qboolean freefall;
|
|
|
|
int fl = ent->v->flags;
|
2004-08-23 00:15:46 +00:00
|
|
|
|
2010-08-16 02:03:02 +00:00
|
|
|
if (ent->v->velocity[2] >= (1.0 / 32.0) && (fl & FL_ONGROUND))
|
|
|
|
{
|
|
|
|
fl &= ~FL_ONGROUND;
|
|
|
|
ent->v->flags = fl;
|
|
|
|
}
|
2005-05-26 12:55:34 +00:00
|
|
|
|
2004-08-23 00:15:46 +00:00
|
|
|
// frefall if not onground
|
2010-08-16 02:03:02 +00:00
|
|
|
if (fl & (FL_ONGROUND | FL_FLY))
|
|
|
|
freefall = false;
|
|
|
|
else
|
|
|
|
freefall = true;
|
|
|
|
if (fl & FL_SWIM)
|
2010-12-18 17:02:47 +00:00
|
|
|
freefall = ent->v->waterlevel <= 0;
|
2010-08-16 02:03:02 +00:00
|
|
|
if (freefall)
|
2004-08-23 00:15:46 +00:00
|
|
|
{
|
2005-05-26 12:55:34 +00:00
|
|
|
hitsound = ent->v->velocity[2] < movevars.gravity*-0.1;
|
2004-08-23 00:15:46 +00:00
|
|
|
|
|
|
|
SV_AddGravity (ent, 1.0);
|
|
|
|
SV_CheckVelocity (ent);
|
|
|
|
SV_FlyMove (ent, host_frametime, NULL);
|
2009-11-04 21:16:50 +00:00
|
|
|
World_LinkEdict (&sv.world, (wedict_t*)ent, true);
|
2004-08-23 00:15:46 +00:00
|
|
|
|
2005-03-28 00:11:59 +00:00
|
|
|
if ( (int)ent->v->flags & FL_ONGROUND ) // just hit ground
|
2004-08-23 00:15:46 +00:00
|
|
|
{
|
|
|
|
if (hitsound)
|
2004-10-13 06:35:27 +00:00
|
|
|
{
|
|
|
|
if (progstype == PROG_H2)
|
2010-11-06 23:05:29 +00:00
|
|
|
SVQ1_StartSound (ent, 0, "fx/thngland.wav", 255, 1, 0);
|
2004-10-13 06:35:27 +00:00
|
|
|
else
|
2010-11-06 23:05:29 +00:00
|
|
|
SVQ1_StartSound (ent, 0, "demon/dland2.wav", 255, 1, 0);
|
2004-10-13 06:35:27 +00:00
|
|
|
}
|
2004-08-23 00:15:46 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
// regular thinking
|
|
|
|
SV_RunThink (ent);
|
2006-02-17 19:54:47 +00:00
|
|
|
|
2004-08-23 00:15:46 +00:00
|
|
|
SV_CheckWaterTransition (ent);
|
|
|
|
}
|
|
|
|
|
|
|
|
//============================================================================
|
|
|
|
|
|
|
|
void SV_ProgStartFrame (void)
|
|
|
|
{
|
|
|
|
|
|
|
|
// let the progs know that a new frame has started
|
2009-11-04 21:16:50 +00:00
|
|
|
pr_global_struct->self = EDICT_TO_PROG(svprogfuncs, sv.world.edicts);
|
|
|
|
pr_global_struct->other = EDICT_TO_PROG(svprogfuncs, sv.world.edicts);
|
|
|
|
pr_global_struct->time = sv.world.physicstime;
|
2007-09-02 19:55:17 +00:00
|
|
|
#ifdef VM_Q1
|
|
|
|
if (svs.gametype == GT_Q1QVM)
|
|
|
|
Q1QVM_StartFrame();
|
|
|
|
else
|
|
|
|
#endif
|
|
|
|
PR_ExecuteProgram (svprogfuncs, pr_global_struct->StartFrame);
|
2004-08-23 00:15:46 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
/*
|
|
|
|
=============
|
|
|
|
SV_CheckStuck
|
|
|
|
|
|
|
|
This is a big hack to try and fix the rare case of getting stuck in the world
|
|
|
|
clipping hull.
|
|
|
|
=============
|
|
|
|
*/
|
2010-07-11 10:53:13 +00:00
|
|
|
static void SV_CheckStuck (edict_t *ent)
|
2004-08-23 00:15:46 +00:00
|
|
|
{
|
|
|
|
int i, j;
|
|
|
|
int z;
|
|
|
|
vec3_t org;
|
|
|
|
//return;
|
2009-11-04 21:16:50 +00:00
|
|
|
if (!World_TestEntityPosition (&sv.world, (wedict_t*)ent))
|
2004-08-23 00:15:46 +00:00
|
|
|
{
|
2005-03-28 00:11:59 +00:00
|
|
|
VectorCopy (ent->v->origin, ent->v->oldorigin);
|
2004-08-23 00:15:46 +00:00
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
2005-03-28 00:11:59 +00:00
|
|
|
VectorCopy (ent->v->origin, org);
|
|
|
|
VectorCopy (ent->v->oldorigin, ent->v->origin);
|
2009-11-04 21:16:50 +00:00
|
|
|
if (!World_TestEntityPosition (&sv.world, (wedict_t*)ent))
|
2004-08-23 00:15:46 +00:00
|
|
|
{
|
|
|
|
Con_DPrintf ("Unstuck.\n");
|
2009-11-04 21:16:50 +00:00
|
|
|
World_LinkEdict (&sv.world, (wedict_t*)ent, true);
|
2004-08-23 00:15:46 +00:00
|
|
|
return;
|
|
|
|
}
|
2006-02-17 19:54:47 +00:00
|
|
|
|
2007-06-20 00:02:54 +00:00
|
|
|
for (z=0 ; z < movevars.stepheight ; z++)
|
2004-08-23 00:15:46 +00:00
|
|
|
for (i=-1 ; i <= 1 ; i++)
|
|
|
|
for (j=-1 ; j <= 1 ; j++)
|
|
|
|
{
|
2005-03-28 00:11:59 +00:00
|
|
|
ent->v->origin[0] = org[0] + i;
|
|
|
|
ent->v->origin[1] = org[1] + j;
|
|
|
|
ent->v->origin[2] = org[2] + z;
|
2009-11-04 21:16:50 +00:00
|
|
|
if (!World_TestEntityPosition (&sv.world, (wedict_t*)ent))
|
2004-08-23 00:15:46 +00:00
|
|
|
{
|
|
|
|
Con_DPrintf ("Unstuck.\n");
|
2009-11-04 21:16:50 +00:00
|
|
|
World_LinkEdict (&sv.world, (wedict_t*)ent, true);
|
2004-08-23 00:15:46 +00:00
|
|
|
return;
|
|
|
|
}
|
|
|
|
}
|
2006-02-17 19:54:47 +00:00
|
|
|
|
2005-03-28 00:11:59 +00:00
|
|
|
VectorCopy (org, ent->v->origin);
|
2004-08-23 00:15:46 +00:00
|
|
|
Con_DPrintf ("player is stuck.\n");
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
=============
|
|
|
|
SV_CheckWater
|
|
|
|
=============
|
|
|
|
*/
|
2010-07-11 10:53:13 +00:00
|
|
|
static qboolean SV_CheckWater (edict_t *ent)
|
2004-08-23 00:15:46 +00:00
|
|
|
{
|
|
|
|
vec3_t point;
|
|
|
|
int cont;
|
|
|
|
|
2005-03-28 00:11:59 +00:00
|
|
|
point[0] = ent->v->origin[0];
|
|
|
|
point[1] = ent->v->origin[1];
|
2006-02-17 19:54:47 +00:00
|
|
|
point[2] = ent->v->origin[2] + ent->v->mins[2] + 1;
|
2004-08-23 00:15:46 +00:00
|
|
|
|
2005-03-28 00:11:59 +00:00
|
|
|
ent->v->waterlevel = 0;
|
|
|
|
ent->v->watertype = Q1CONTENTS_EMPTY;
|
2009-11-04 21:16:50 +00:00
|
|
|
cont = World_PointContents (&sv.world, point);
|
2004-08-23 00:15:46 +00:00
|
|
|
if (cont & FTECONTENTS_FLUID)
|
|
|
|
{
|
|
|
|
if (cont & FTECONTENTS_LAVA)
|
2005-03-28 00:11:59 +00:00
|
|
|
ent->v->watertype = Q1CONTENTS_LAVA;
|
2004-08-23 00:15:46 +00:00
|
|
|
else if (cont & FTECONTENTS_SLIME)
|
2005-03-28 00:11:59 +00:00
|
|
|
ent->v->watertype = Q1CONTENTS_SLIME;
|
2004-08-23 00:15:46 +00:00
|
|
|
else if (cont & FTECONTENTS_WATER)
|
2005-03-28 00:11:59 +00:00
|
|
|
ent->v->watertype = Q1CONTENTS_WATER;
|
2006-02-17 19:54:47 +00:00
|
|
|
else
|
2005-03-28 00:11:59 +00:00
|
|
|
ent->v->watertype = Q1CONTENTS_SKY;
|
|
|
|
ent->v->waterlevel = 1;
|
|
|
|
point[2] = ent->v->origin[2] + (ent->v->mins[2] + ent->v->maxs[2])*0.5;
|
2009-11-04 21:16:50 +00:00
|
|
|
cont = World_PointContents (&sv.world, point);
|
2004-08-23 00:15:46 +00:00
|
|
|
if (cont & FTECONTENTS_FLUID)
|
|
|
|
{
|
2005-03-28 00:11:59 +00:00
|
|
|
ent->v->waterlevel = 2;
|
|
|
|
point[2] = ent->v->origin[2] + ent->v->view_ofs[2];
|
2009-11-04 21:16:50 +00:00
|
|
|
cont = World_PointContents (&sv.world, point);
|
2004-08-23 00:15:46 +00:00
|
|
|
if (cont & FTECONTENTS_FLUID)
|
2005-03-28 00:11:59 +00:00
|
|
|
ent->v->waterlevel = 3;
|
2004-08-23 00:15:46 +00:00
|
|
|
}
|
|
|
|
}
|
2006-02-17 19:54:47 +00:00
|
|
|
|
2005-03-28 00:11:59 +00:00
|
|
|
return ent->v->waterlevel > 1;
|
2004-08-23 00:15:46 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
/*
|
|
|
|
============
|
|
|
|
SV_WallFriction
|
|
|
|
|
|
|
|
============
|
|
|
|
*/
|
2010-07-11 10:53:13 +00:00
|
|
|
static void SV_WallFriction (edict_t *ent, trace_t *trace)
|
2004-08-23 00:15:46 +00:00
|
|
|
{
|
|
|
|
vec3_t forward, right, up;
|
|
|
|
float d, i;
|
|
|
|
vec3_t into, side;
|
2006-02-17 19:54:47 +00:00
|
|
|
|
2005-03-28 00:11:59 +00:00
|
|
|
AngleVectors (ent->v->v_angle, forward, right, up);
|
2004-08-23 00:15:46 +00:00
|
|
|
d = DotProduct (trace->plane.normal, forward);
|
2006-02-17 19:54:47 +00:00
|
|
|
|
2004-08-23 00:15:46 +00:00
|
|
|
d += 0.5;
|
|
|
|
if (d >= 0 || IS_NAN(d))
|
|
|
|
return;
|
2006-02-17 19:54:47 +00:00
|
|
|
|
2004-08-23 00:15:46 +00:00
|
|
|
// cut the tangential velocity
|
2005-03-28 00:11:59 +00:00
|
|
|
i = DotProduct (trace->plane.normal, ent->v->velocity);
|
2004-08-23 00:15:46 +00:00
|
|
|
VectorScale (trace->plane.normal, i, into);
|
2005-03-28 00:11:59 +00:00
|
|
|
VectorSubtract (ent->v->velocity, into, side);
|
2006-02-17 19:54:47 +00:00
|
|
|
|
2005-03-28 00:11:59 +00:00
|
|
|
ent->v->velocity[0] = side[0] * (1 + d);
|
|
|
|
ent->v->velocity[1] = side[1] * (1 + d);
|
2004-08-23 00:15:46 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
=====================
|
|
|
|
SV_TryUnstick
|
|
|
|
|
|
|
|
Player has come to a dead stop, possibly due to the problem with limited
|
|
|
|
float precision at some angle joins in the BSP hull.
|
|
|
|
|
|
|
|
Try fixing by pushing one pixel in each direction.
|
|
|
|
|
|
|
|
This is a hack, but in the interest of good gameplay...
|
|
|
|
======================
|
|
|
|
*/
|
2010-07-11 10:53:13 +00:00
|
|
|
static int SV_TryUnstick (edict_t *ent, vec3_t oldvel)
|
2004-08-23 00:15:46 +00:00
|
|
|
{
|
|
|
|
int i;
|
|
|
|
vec3_t oldorg;
|
|
|
|
vec3_t dir;
|
|
|
|
int clip;
|
|
|
|
trace_t steptrace;
|
2006-02-17 19:54:47 +00:00
|
|
|
|
2005-03-28 00:11:59 +00:00
|
|
|
VectorCopy (ent->v->origin, oldorg);
|
2006-05-29 04:50:24 +00:00
|
|
|
VectorClear (dir);
|
2004-08-23 00:15:46 +00:00
|
|
|
|
|
|
|
for (i=0 ; i<8 ; i++)
|
|
|
|
{
|
|
|
|
// try pushing a little in an axial direction
|
|
|
|
switch (i)
|
|
|
|
{
|
|
|
|
case 0: dir[0] = 2; dir[1] = 0; break;
|
|
|
|
case 1: dir[0] = 0; dir[1] = 2; break;
|
|
|
|
case 2: dir[0] = -2; dir[1] = 0; break;
|
|
|
|
case 3: dir[0] = 0; dir[1] = -2; break;
|
|
|
|
case 4: dir[0] = 2; dir[1] = 2; break;
|
|
|
|
case 5: dir[0] = -2; dir[1] = 2; break;
|
|
|
|
case 6: dir[0] = 2; dir[1] = -2; break;
|
|
|
|
case 7: dir[0] = -2; dir[1] = -2; break;
|
|
|
|
}
|
2006-02-17 19:54:47 +00:00
|
|
|
|
2009-11-04 21:16:50 +00:00
|
|
|
SV_PushEntity (ent, dir, MOVE_NORMAL);
|
2004-08-23 00:15:46 +00:00
|
|
|
|
|
|
|
// retry the original move
|
2005-03-28 00:11:59 +00:00
|
|
|
ent->v->velocity[0] = oldvel[0];
|
|
|
|
ent->v-> velocity[1] = oldvel[1];
|
|
|
|
ent->v-> velocity[2] = 0;
|
2004-08-23 00:15:46 +00:00
|
|
|
clip = SV_FlyMove (ent, 0.1, &steptrace);
|
|
|
|
|
2005-03-28 00:11:59 +00:00
|
|
|
if ( fabs(oldorg[1] - ent->v->origin[1]) > 4
|
|
|
|
|| fabs(oldorg[0] - ent->v->origin[0]) > 4 )
|
2004-08-23 00:15:46 +00:00
|
|
|
{
|
|
|
|
//Con_DPrintf ("unstuck!\n");
|
|
|
|
return clip;
|
|
|
|
}
|
2006-02-17 19:54:47 +00:00
|
|
|
|
2004-08-23 00:15:46 +00:00
|
|
|
// go back to the original pos and try again
|
2005-03-28 00:11:59 +00:00
|
|
|
VectorCopy (oldorg, ent->v->origin);
|
2004-08-23 00:15:46 +00:00
|
|
|
}
|
2006-02-17 19:54:47 +00:00
|
|
|
|
2006-05-29 04:50:24 +00:00
|
|
|
VectorClear (ent->v->velocity);
|
2004-08-23 00:15:46 +00:00
|
|
|
return 7; // still not moving
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
=====================
|
|
|
|
SV_WalkMove
|
|
|
|
|
|
|
|
Only used by players
|
|
|
|
======================
|
|
|
|
*/
|
2005-05-26 12:55:34 +00:00
|
|
|
#if 0
|
2004-08-23 00:15:46 +00:00
|
|
|
#define SMSTEPSIZE 4
|
2010-07-11 10:53:13 +00:00
|
|
|
static void SV_WalkMove (edict_t *ent)
|
2004-08-23 00:15:46 +00:00
|
|
|
{
|
|
|
|
vec3_t upmove, downmove;
|
|
|
|
vec3_t oldorg, oldvel;
|
|
|
|
vec3_t nosteporg, nostepvel;
|
|
|
|
int clip;
|
|
|
|
int oldonground;
|
|
|
|
trace_t steptrace, downtrace;
|
2006-02-17 19:54:47 +00:00
|
|
|
|
2004-08-23 00:15:46 +00:00
|
|
|
//
|
|
|
|
// do a regular slide move unless it looks like you ran into a step
|
|
|
|
//
|
2005-03-28 00:11:59 +00:00
|
|
|
oldonground = (int)ent->v->flags & FL_ONGROUND;
|
|
|
|
ent->v->flags = (int)ent->v->flags & ~FL_ONGROUND;
|
2006-02-17 19:54:47 +00:00
|
|
|
|
2005-03-28 00:11:59 +00:00
|
|
|
VectorCopy (ent->v->origin, oldorg);
|
|
|
|
VectorCopy (ent->v->velocity, oldvel);
|
2006-02-17 19:54:47 +00:00
|
|
|
|
2004-08-23 00:15:46 +00:00
|
|
|
clip = SV_FlyMove (ent, host_frametime, &steptrace);
|
|
|
|
|
|
|
|
if ( !(clip & 2) )
|
|
|
|
return; // move didn't block on a step
|
|
|
|
|
2005-03-28 00:11:59 +00:00
|
|
|
if (!oldonground && ent->v->waterlevel == 0)
|
2004-08-23 00:15:46 +00:00
|
|
|
return; // don't stair up while jumping
|
2006-02-17 19:54:47 +00:00
|
|
|
|
2005-03-28 00:11:59 +00:00
|
|
|
if (ent->v->movetype != MOVETYPE_WALK)
|
2004-08-23 00:15:46 +00:00
|
|
|
return; // gibbed by a trigger
|
2006-02-17 19:54:47 +00:00
|
|
|
|
2004-08-23 00:15:46 +00:00
|
|
|
// if (sv_nostep.value)
|
|
|
|
// return;
|
2006-02-17 19:54:47 +00:00
|
|
|
|
2005-03-28 00:11:59 +00:00
|
|
|
if ( (int)ent->v->flags & FL_WATERJUMP )
|
2004-08-23 00:15:46 +00:00
|
|
|
return;
|
|
|
|
|
2005-03-28 00:11:59 +00:00
|
|
|
VectorCopy (ent->v->origin, nosteporg);
|
|
|
|
VectorCopy (ent->v->velocity, nostepvel);
|
2004-08-23 00:15:46 +00:00
|
|
|
|
|
|
|
//
|
|
|
|
// try moving up and forward to go up a step
|
|
|
|
//
|
2005-03-28 00:11:59 +00:00
|
|
|
VectorCopy (oldorg, ent->v->origin); // back to start pos
|
2004-08-23 00:15:46 +00:00
|
|
|
|
|
|
|
VectorCopy (vec3_origin, upmove);
|
|
|
|
VectorCopy (vec3_origin, downmove);
|
2007-06-20 00:02:54 +00:00
|
|
|
upmove[2] = movevars.stepheight;
|
|
|
|
downmove[2] = -movevars.stepheight + oldvel[2]*host_frametime;
|
2004-08-23 00:15:46 +00:00
|
|
|
|
|
|
|
// move up
|
|
|
|
SV_PushEntity (ent, upmove); // FIXME: don't link?
|
|
|
|
|
|
|
|
// move forward
|
2005-03-28 00:11:59 +00:00
|
|
|
ent->v->velocity[0] = oldvel[0];
|
|
|
|
ent->v->velocity[1] = oldvel[1];
|
|
|
|
ent->v->velocity[2] = 0;
|
2004-08-23 00:15:46 +00:00
|
|
|
clip = SV_FlyMove (ent, host_frametime, &steptrace);
|
|
|
|
|
|
|
|
// check for stuckness, possibly due to the limited precision of floats
|
|
|
|
// in the clipping hulls
|
|
|
|
if (clip)
|
|
|
|
{
|
2005-03-28 00:11:59 +00:00
|
|
|
if ( fabs(oldorg[1] - ent->v->origin[1]) < 0.03125
|
|
|
|
&& fabs(oldorg[0] - ent->v->origin[0]) < 0.03125 )
|
2004-08-23 00:15:46 +00:00
|
|
|
{ // stepping up didn't make any progress
|
|
|
|
clip = SV_TryUnstick (ent, oldvel);
|
2004-09-22 15:29:33 +00:00
|
|
|
|
|
|
|
// Con_Printf("Try unstick fwd\n");
|
2004-08-23 00:15:46 +00:00
|
|
|
}
|
|
|
|
}
|
2006-02-17 19:54:47 +00:00
|
|
|
|
2004-08-23 00:15:46 +00:00
|
|
|
// extra friction based on view angle
|
|
|
|
if ( clip & 2 )
|
|
|
|
{
|
|
|
|
vec3_t lastpos, lastvel, lastdown;
|
2004-09-22 15:29:33 +00:00
|
|
|
|
|
|
|
// Con_Printf("couldn't do it\n");
|
|
|
|
|
2004-08-23 00:15:46 +00:00
|
|
|
//retry with a smaller step (allows entering smaller areas with a step of 4)
|
|
|
|
VectorCopy (downmove, lastdown);
|
2005-03-28 00:11:59 +00:00
|
|
|
VectorCopy (ent->v->origin, lastpos);
|
|
|
|
VectorCopy (ent->v->velocity, lastvel);
|
2004-08-23 00:15:46 +00:00
|
|
|
|
|
|
|
//
|
|
|
|
// try moving up and forward to go up a step
|
|
|
|
//
|
2005-03-28 00:11:59 +00:00
|
|
|
VectorCopy (oldorg, ent->v->origin); // back to start pos
|
2004-08-23 00:15:46 +00:00
|
|
|
|
|
|
|
VectorCopy (vec3_origin, upmove);
|
|
|
|
VectorCopy (vec3_origin, downmove);
|
|
|
|
upmove[2] = SMSTEPSIZE;
|
|
|
|
downmove[2] = -SMSTEPSIZE + oldvel[2]*host_frametime;
|
|
|
|
|
|
|
|
// move up
|
|
|
|
SV_PushEntity (ent, upmove); // FIXME: don't link?
|
|
|
|
|
|
|
|
// move forward
|
2005-03-28 00:11:59 +00:00
|
|
|
ent->v->velocity[0] = oldvel[0];
|
|
|
|
ent->v->velocity[1] = oldvel[1];
|
|
|
|
ent->v->velocity[2] = 0;
|
2004-08-23 00:15:46 +00:00
|
|
|
clip = SV_FlyMove (ent, host_frametime, &steptrace);
|
|
|
|
|
|
|
|
// check for stuckness, possibly due to the limited precision of floats
|
|
|
|
// in the clipping hulls
|
|
|
|
if (clip)
|
|
|
|
{
|
2005-03-28 00:11:59 +00:00
|
|
|
if ( fabs(oldorg[1] - ent->v->origin[1]) < 0.03125
|
|
|
|
&& fabs(oldorg[0] - ent->v->origin[0]) < 0.03125 )
|
2004-08-23 00:15:46 +00:00
|
|
|
{ // stepping up didn't make any progress
|
|
|
|
clip = SV_TryUnstick (ent, oldvel);
|
2004-09-22 15:29:33 +00:00
|
|
|
|
|
|
|
// Con_Printf("Try unstick up\n");
|
2004-08-23 00:15:46 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2005-03-28 00:11:59 +00:00
|
|
|
if ( fabs(oldorg[1] - ent->v->origin[1])+fabs(oldorg[0] - ent->v->origin[0]) < fabs(oldorg[1] - lastpos[1])+fabs(oldorg[1] - lastpos[1]))
|
2004-08-23 00:15:46 +00:00
|
|
|
{ // stepping up didn't make any progress
|
|
|
|
//go back
|
|
|
|
VectorCopy (lastdown, downmove);
|
2005-03-28 00:11:59 +00:00
|
|
|
VectorCopy (lastpos, ent->v->origin);
|
|
|
|
VectorCopy (lastvel, ent->v->velocity);
|
2004-08-23 00:15:46 +00:00
|
|
|
|
|
|
|
SV_WallFriction (ent, &steptrace);
|
2004-09-22 15:29:33 +00:00
|
|
|
|
|
|
|
// Con_Printf("wall friction\n");
|
2004-08-23 00:15:46 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
else if (clip & 2)
|
2004-09-22 15:29:33 +00:00
|
|
|
{
|
2004-08-23 00:15:46 +00:00
|
|
|
SV_WallFriction (ent, &steptrace);
|
2004-09-22 15:29:33 +00:00
|
|
|
// Con_Printf("wall friction 2\n");
|
|
|
|
}
|
2004-08-23 00:15:46 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
// move down
|
|
|
|
downtrace = SV_PushEntity (ent, downmove); // FIXME: don't link?
|
|
|
|
|
|
|
|
if (downtrace.plane.normal[2] > 0.7)
|
|
|
|
{
|
2005-03-28 00:11:59 +00:00
|
|
|
if (ent->v->solid == SOLID_BSP)
|
2004-08-23 00:15:46 +00:00
|
|
|
{
|
2005-03-28 00:11:59 +00:00
|
|
|
ent->v->flags = (int)ent->v->flags | FL_ONGROUND;
|
|
|
|
ent->v->groundentity = EDICT_TO_PROG(svprogfuncs, downtrace.ent);
|
2004-08-23 00:15:46 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
// if the push down didn't end up on good ground, use the move without
|
|
|
|
// the step up. This happens near wall / slope combinations, and can
|
2006-02-17 19:54:47 +00:00
|
|
|
// cause the player to hop up higher on a slope too steep to climb
|
2005-03-28 00:11:59 +00:00
|
|
|
VectorCopy (nosteporg, ent->v->origin);
|
|
|
|
VectorCopy (nostepvel, ent->v->velocity);
|
2004-09-22 15:29:33 +00:00
|
|
|
|
|
|
|
// Con_Printf("down not good\n");
|
2004-08-23 00:15:46 +00:00
|
|
|
}
|
|
|
|
}
|
2005-05-26 12:55:34 +00:00
|
|
|
#else
|
2004-11-19 17:43:55 +00:00
|
|
|
|
2005-06-14 04:52:10 +00:00
|
|
|
// 1/32 epsilon to keep floating point happy
|
|
|
|
#define DIST_EPSILON (0.03125)
|
2010-07-11 10:53:13 +00:00
|
|
|
static int SV_SetOnGround (edict_t *ent)
|
2004-11-19 17:43:55 +00:00
|
|
|
{
|
|
|
|
vec3_t end;
|
|
|
|
trace_t trace;
|
2005-03-28 00:11:59 +00:00
|
|
|
if ((int)ent->v->flags & FL_ONGROUND)
|
2004-11-19 17:43:55 +00:00
|
|
|
return 1;
|
2005-03-28 00:11:59 +00:00
|
|
|
end[0] = ent->v->origin[0];
|
|
|
|
end[1] = ent->v->origin[1];
|
|
|
|
end[2] = ent->v->origin[2] - 1;
|
2009-11-04 21:16:50 +00:00
|
|
|
trace = World_Move(&sv.world, ent->v->origin, ent->v->mins, ent->v->maxs, end, MOVE_NORMAL, (wedict_t*)ent);
|
2005-06-14 04:52:10 +00:00
|
|
|
if (trace.fraction <= DIST_EPSILON && trace.plane.normal[2] >= 0.7)
|
2004-11-19 17:43:55 +00:00
|
|
|
{
|
2005-03-28 00:11:59 +00:00
|
|
|
ent->v->flags = (int)ent->v->flags | FL_ONGROUND;
|
|
|
|
ent->v->groundentity = EDICT_TO_PROG(svprogfuncs, trace.ent);
|
2004-11-19 17:43:55 +00:00
|
|
|
return 1;
|
|
|
|
}
|
|
|
|
return 0;
|
|
|
|
}
|
2010-07-11 10:53:13 +00:00
|
|
|
static void SV_WalkMove (edict_t *ent)
|
2004-11-19 17:43:55 +00:00
|
|
|
{
|
|
|
|
int clip, oldonground, originalmove_clip, originalmove_flags, originalmove_groundentity;
|
|
|
|
vec3_t upmove, downmove, start_origin, start_velocity, originalmove_origin, originalmove_velocity;
|
|
|
|
trace_t downtrace, steptrace;
|
|
|
|
|
|
|
|
SV_CheckVelocity(ent);
|
|
|
|
|
|
|
|
// do a regular slide move unless it looks like you ran into a step
|
2005-03-28 00:11:59 +00:00
|
|
|
oldonground = (int)ent->v->flags & FL_ONGROUND;
|
|
|
|
ent->v->flags = (int)ent->v->flags & ~FL_ONGROUND;
|
2004-11-19 17:43:55 +00:00
|
|
|
|
2005-03-28 00:11:59 +00:00
|
|
|
VectorCopy (ent->v->origin, start_origin);
|
|
|
|
VectorCopy (ent->v->velocity, start_velocity);
|
2004-11-19 17:43:55 +00:00
|
|
|
|
|
|
|
clip = SV_FlyMove (ent, host_frametime, NULL);
|
|
|
|
|
|
|
|
SV_SetOnGround (ent);
|
|
|
|
SV_CheckVelocity(ent);
|
|
|
|
|
2005-03-28 00:11:59 +00:00
|
|
|
VectorCopy(ent->v->origin, originalmove_origin);
|
|
|
|
VectorCopy(ent->v->velocity, originalmove_velocity);
|
2004-11-19 17:43:55 +00:00
|
|
|
originalmove_clip = clip;
|
2005-03-28 00:11:59 +00:00
|
|
|
originalmove_flags = (int)ent->v->flags;
|
|
|
|
originalmove_groundentity = ent->v->groundentity;
|
2004-11-19 17:43:55 +00:00
|
|
|
|
2005-03-28 00:11:59 +00:00
|
|
|
if ((int)ent->v->flags & FL_WATERJUMP)
|
2004-11-19 17:43:55 +00:00
|
|
|
return;
|
|
|
|
|
|
|
|
// if (sv_nostep.value)
|
|
|
|
// return;
|
2006-02-17 19:54:47 +00:00
|
|
|
|
2004-11-19 17:43:55 +00:00
|
|
|
// if move didn't block on a step, return
|
|
|
|
if (clip & 2)
|
|
|
|
{
|
|
|
|
// if move was not trying to move into the step, return
|
|
|
|
if (fabs(start_velocity[0]) < 0.03125 && fabs(start_velocity[1]) < 0.03125)
|
|
|
|
return;
|
2006-02-17 19:54:47 +00:00
|
|
|
|
2005-03-28 00:11:59 +00:00
|
|
|
if (ent->v->movetype != MOVETYPE_FLY)
|
2004-11-19 17:43:55 +00:00
|
|
|
{
|
|
|
|
// return if gibbed by a trigger
|
2005-03-28 00:11:59 +00:00
|
|
|
if (ent->v->movetype != MOVETYPE_WALK)
|
2004-11-19 17:43:55 +00:00
|
|
|
return;
|
2006-02-17 19:54:47 +00:00
|
|
|
|
2004-11-19 17:43:55 +00:00
|
|
|
// only step up while jumping if that is enabled
|
|
|
|
// if (!(sv_jumpstep.value && sv_gameplayfix_stepwhilejumping.value))
|
2005-03-28 00:11:59 +00:00
|
|
|
if (!oldonground && ent->v->waterlevel == 0)
|
2004-11-19 17:43:55 +00:00
|
|
|
return;
|
|
|
|
}
|
2006-02-17 19:54:47 +00:00
|
|
|
|
2004-11-19 17:43:55 +00:00
|
|
|
// try moving up and forward to go up a step
|
|
|
|
// back to start pos
|
2005-03-28 00:11:59 +00:00
|
|
|
VectorCopy (start_origin, ent->v->origin);
|
|
|
|
VectorCopy (start_velocity, ent->v->velocity);
|
2006-02-17 19:54:47 +00:00
|
|
|
|
2004-11-19 17:43:55 +00:00
|
|
|
// move up
|
|
|
|
VectorClear (upmove);
|
2007-06-20 00:02:54 +00:00
|
|
|
upmove[2] = movevars.stepheight;
|
2004-11-19 17:43:55 +00:00
|
|
|
// FIXME: don't link?
|
2009-11-04 21:16:50 +00:00
|
|
|
SV_PushEntity(ent, upmove, MOVE_NORMAL);
|
2005-05-15 18:49:04 +00:00
|
|
|
|
2004-11-19 17:43:55 +00:00
|
|
|
// move forward
|
2005-03-28 00:11:59 +00:00
|
|
|
ent->v->velocity[2] = 0;
|
2004-11-19 17:43:55 +00:00
|
|
|
clip = SV_FlyMove (ent, host_frametime, &steptrace);
|
2005-03-28 00:11:59 +00:00
|
|
|
ent->v->velocity[2] += start_velocity[2];
|
2006-02-17 19:54:47 +00:00
|
|
|
|
2004-11-19 17:43:55 +00:00
|
|
|
SV_CheckVelocity(ent);
|
2006-02-17 19:54:47 +00:00
|
|
|
|
2004-11-19 17:43:55 +00:00
|
|
|
// check for stuckness, possibly due to the limited precision of floats
|
|
|
|
// in the clipping hulls
|
|
|
|
if (clip
|
2005-03-28 00:11:59 +00:00
|
|
|
&& fabs(originalmove_origin[1] - ent->v->origin[1]) < 0.03125
|
|
|
|
&& fabs(originalmove_origin[0] - ent->v->origin[0]) < 0.03125)
|
2004-11-19 17:43:55 +00:00
|
|
|
{
|
|
|
|
// Con_Printf("wall\n");
|
|
|
|
// stepping up didn't make any progress, revert to original move
|
2005-03-28 00:11:59 +00:00
|
|
|
VectorCopy(originalmove_origin, ent->v->origin);
|
|
|
|
VectorCopy(originalmove_velocity, ent->v->velocity);
|
2004-11-19 17:43:55 +00:00
|
|
|
//clip = originalmove_clip;
|
2005-03-28 00:11:59 +00:00
|
|
|
ent->v->flags = originalmove_flags;
|
2006-02-17 19:54:47 +00:00
|
|
|
ent->v->groundentity = originalmove_groundentity;
|
2004-11-19 17:43:55 +00:00
|
|
|
// now try to unstick if needed
|
|
|
|
//clip = SV_TryUnstick (ent, oldvel);
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
|
|
|
//Con_Printf("step - ");
|
|
|
|
|
|
|
|
// extra friction based on view angle
|
|
|
|
if (clip & 2)// && sv_wallfriction.value)
|
|
|
|
{
|
|
|
|
// Con_Printf("wall\n");
|
|
|
|
SV_WallFriction (ent, &steptrace);
|
|
|
|
}
|
|
|
|
}
|
2005-03-28 00:11:59 +00:00
|
|
|
else if (/*!sv_gameplayfix_stepdown.integer || */!oldonground || start_velocity[2] > 0 || ((int)ent->v->flags & FL_ONGROUND) || ent->v->waterlevel >= 2)
|
2004-11-19 17:43:55 +00:00
|
|
|
return;
|
|
|
|
|
|
|
|
// move down
|
|
|
|
VectorClear (downmove);
|
2007-06-20 00:02:54 +00:00
|
|
|
downmove[2] = -movevars.stepheight + start_velocity[2]*host_frametime;
|
2004-11-19 17:43:55 +00:00
|
|
|
// FIXME: don't link?
|
2009-11-04 21:16:50 +00:00
|
|
|
downtrace = SV_PushEntity (ent, downmove, MOVE_NORMAL);
|
2004-11-19 17:43:55 +00:00
|
|
|
|
|
|
|
if (downtrace.fraction < 1 && downtrace.plane.normal[2] > 0.7)
|
|
|
|
{
|
|
|
|
// LordHavoc: disabled this check so you can walk on monsters/players
|
|
|
|
//if (ent->v->solid == SOLID_BSP)
|
|
|
|
{
|
|
|
|
//Con_Printf("onground\n");
|
2005-03-28 00:11:59 +00:00
|
|
|
ent->v->flags = (int)ent->v->flags | FL_ONGROUND;
|
|
|
|
ent->v->groundentity = EDICT_TO_PROG(svprogfuncs, downtrace.ent);
|
2004-11-19 17:43:55 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
//Con_Printf("slope\n");
|
|
|
|
// if the push down didn't end up on good ground, use the move without
|
|
|
|
// the step up. This happens near wall / slope combinations, and can
|
|
|
|
// cause the player to hop up higher on a slope too steep to climb
|
2005-03-28 00:11:59 +00:00
|
|
|
VectorCopy(originalmove_origin, ent->v->origin);
|
|
|
|
VectorCopy(originalmove_velocity, ent->v->velocity);
|
2004-11-19 17:43:55 +00:00
|
|
|
//clip = originalmove_clip;
|
2005-03-28 00:11:59 +00:00
|
|
|
ent->v->flags = originalmove_flags;
|
2006-02-17 19:54:47 +00:00
|
|
|
ent->v->groundentity = originalmove_groundentity;
|
2004-11-19 17:43:55 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
SV_SetOnGround (ent);
|
|
|
|
SV_CheckVelocity(ent);
|
|
|
|
}
|
2005-05-26 12:55:34 +00:00
|
|
|
#endif
|
2004-08-23 00:15:46 +00:00
|
|
|
|
2010-07-11 10:53:13 +00:00
|
|
|
static void SV_MoveChain(edict_t *ent, edict_t *movechain, float *initial_origin, float *initial_angle)
|
2008-11-09 22:29:28 +00:00
|
|
|
{
|
|
|
|
qboolean callfunc;
|
|
|
|
if ((callfunc=DotProduct(ent->v->origin, initial_origin)) || DotProduct(ent->v->angles, initial_angle))
|
|
|
|
{
|
|
|
|
vec3_t moveang, moveorg;
|
|
|
|
int i;
|
2009-03-03 01:52:30 +00:00
|
|
|
VectorSubtract(ent->v->angles, initial_angle, moveang);
|
|
|
|
VectorSubtract(ent->v->origin, initial_origin, moveorg);
|
2008-11-09 22:29:28 +00:00
|
|
|
|
2009-11-04 21:16:50 +00:00
|
|
|
for(i=16;i && movechain != (edict_t*)sv.world.edicts && !movechain->isfree;i--, movechain = PROG_TO_EDICT(svprogfuncs, movechain->xv->movechain))
|
2008-11-09 22:29:28 +00:00
|
|
|
{
|
|
|
|
if ((int)movechain->v->flags & FL_MOVECHAIN_ANGLE)
|
|
|
|
VectorAdd(movechain->v->angles, moveang, movechain->v->angles);
|
|
|
|
VectorAdd(movechain->v->origin, moveorg, movechain->v->origin);
|
|
|
|
|
|
|
|
if (movechain->xv->chainmoved && callfunc)
|
|
|
|
{
|
|
|
|
pr_global_struct->self = EDICT_TO_PROG(svprogfuncs, movechain);
|
|
|
|
pr_global_struct->other = EDICT_TO_PROG(svprogfuncs, ent);
|
|
|
|
#ifdef VM_Q1
|
|
|
|
if (svs.gametype == GT_Q1QVM)
|
|
|
|
Q1QVM_ChainMoved();
|
|
|
|
else
|
|
|
|
#endif
|
|
|
|
PR_ExecuteProgram(svprogfuncs, movechain->xv->chainmoved);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
2004-08-23 00:15:46 +00:00
|
|
|
|
2005-06-22 17:10:13 +00:00
|
|
|
#define FL_JUMPRELEASED 4096
|
2004-08-23 00:15:46 +00:00
|
|
|
/*
|
|
|
|
================
|
2005-06-22 17:10:13 +00:00
|
|
|
SV_RunEntity
|
2004-08-23 00:15:46 +00:00
|
|
|
|
|
|
|
================
|
|
|
|
*/
|
2005-06-22 17:10:13 +00:00
|
|
|
void SV_RunEntity (edict_t *ent)
|
2004-08-23 00:15:46 +00:00
|
|
|
{
|
2005-06-22 17:10:13 +00:00
|
|
|
edict_t *movechain;
|
|
|
|
vec3_t initial_origin,initial_angle;
|
2004-08-23 00:15:46 +00:00
|
|
|
|
2005-06-22 17:10:13 +00:00
|
|
|
if (ent->entnum > 0 && ent->entnum <= sv.allocated_client_slots)
|
|
|
|
{ //a client woo.
|
|
|
|
qboolean readyforjump = false;
|
2004-08-23 00:15:46 +00:00
|
|
|
|
2005-06-22 17:10:13 +00:00
|
|
|
if ( svs.clients[ent->entnum-1].state < cs_spawned )
|
|
|
|
return; // unconnected slot
|
2004-08-23 00:15:46 +00:00
|
|
|
|
2004-09-22 15:29:33 +00:00
|
|
|
|
2008-12-06 02:07:04 +00:00
|
|
|
if (svs.clients[ent->entnum-1].protocol == SCP_BAD)
|
|
|
|
svs.clients[ent->entnum-1].edict->v->fixangle = 0; //bots never get fixangle cleared otherwise
|
|
|
|
|
2005-06-22 17:10:13 +00:00
|
|
|
host_client = &svs.clients[ent->entnum-1];
|
|
|
|
SV_ClientThink();
|
2004-08-23 00:15:46 +00:00
|
|
|
|
2004-10-10 06:32:29 +00:00
|
|
|
|
2005-06-22 17:10:13 +00:00
|
|
|
if (progstype == PROG_QW) //detect if the mod should do a jump
|
|
|
|
if (ent->v->button2)
|
|
|
|
if ((int)ent->v->flags & FL_JUMPRELEASED)
|
|
|
|
readyforjump = true;
|
2004-08-23 00:15:46 +00:00
|
|
|
|
2005-06-22 17:10:13 +00:00
|
|
|
//
|
|
|
|
// call standard client pre-think
|
2006-02-17 19:54:47 +00:00
|
|
|
//
|
2009-11-04 21:16:50 +00:00
|
|
|
pr_global_struct->time = sv.world.physicstime;
|
2005-06-22 17:10:13 +00:00
|
|
|
pr_global_struct->self = EDICT_TO_PROG(svprogfuncs, ent);
|
2007-09-02 19:55:17 +00:00
|
|
|
#ifdef VM_Q1
|
|
|
|
if (svs.gametype == GT_Q1QVM)
|
|
|
|
Q1QVM_PlayerPreThink();
|
|
|
|
else
|
|
|
|
#endif
|
|
|
|
if (pr_global_struct->PlayerPreThink)
|
|
|
|
PR_ExecuteProgram (svprogfuncs, pr_global_struct->PlayerPreThink);
|
2006-02-17 19:54:47 +00:00
|
|
|
|
2005-06-22 17:10:13 +00:00
|
|
|
if (readyforjump) //qw progs can't jump for themselves...
|
|
|
|
{
|
|
|
|
if (!ent->v->button2 && !((int)ent->v->flags & FL_JUMPRELEASED) && ent->v->velocity[2] <= 0)
|
|
|
|
ent->v->velocity[2] += 270;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
2010-10-02 02:25:39 +00:00
|
|
|
if ((unsigned int)ent->v->lastruntime == svs.framenum)
|
2004-08-23 00:15:46 +00:00
|
|
|
return;
|
2006-12-26 18:19:35 +00:00
|
|
|
ent->v->lastruntime = svs.framenum;
|
2004-08-23 00:15:46 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
2007-09-02 19:55:17 +00:00
|
|
|
movechain = PROG_TO_EDICT(svprogfuncs, ent->xv->movechain);
|
2009-11-04 21:16:50 +00:00
|
|
|
if (movechain != (edict_t*)sv.world.edicts)
|
2004-08-23 00:15:46 +00:00
|
|
|
{
|
2005-06-22 17:10:13 +00:00
|
|
|
VectorCopy(ent->v->origin,initial_origin);
|
|
|
|
VectorCopy(ent->v->angles,initial_angle);
|
2004-08-23 00:15:46 +00:00
|
|
|
}
|
|
|
|
|
2005-03-28 00:11:59 +00:00
|
|
|
switch ( (int)ent->v->movetype)
|
2004-08-23 00:15:46 +00:00
|
|
|
{
|
|
|
|
case MOVETYPE_PUSH:
|
|
|
|
SV_Physics_Pusher (ent);
|
|
|
|
break;
|
|
|
|
case MOVETYPE_NONE:
|
2005-06-22 17:10:13 +00:00
|
|
|
if (!SV_RunThink (ent))
|
|
|
|
return;
|
2004-08-23 00:15:46 +00:00
|
|
|
break;
|
|
|
|
case MOVETYPE_NOCLIP:
|
2011-02-27 15:01:56 +00:00
|
|
|
case MOVETYPE_ANGLENOCLIP:
|
2004-08-23 00:15:46 +00:00
|
|
|
SV_Physics_Noclip (ent);
|
|
|
|
break;
|
|
|
|
case MOVETYPE_STEP:
|
2010-08-11 23:55:35 +00:00
|
|
|
case MOVETYPE_H2PUSHPULL:
|
2004-08-23 00:15:46 +00:00
|
|
|
SV_Physics_Step (ent);
|
|
|
|
break;
|
2004-10-10 06:32:29 +00:00
|
|
|
case MOVETYPE_FOLLOW:
|
|
|
|
SV_Physics_Follow (ent);
|
|
|
|
break;
|
2010-08-16 02:03:02 +00:00
|
|
|
case MOVETYPE_FLY:
|
|
|
|
case MOVETYPE_H2SWIM:
|
2004-08-23 00:15:46 +00:00
|
|
|
case MOVETYPE_TOSS:
|
|
|
|
case MOVETYPE_BOUNCE:
|
|
|
|
case MOVETYPE_BOUNCEMISSILE:
|
|
|
|
case MOVETYPE_FLYMISSILE:
|
|
|
|
SV_Physics_Toss (ent);
|
|
|
|
break;
|
|
|
|
case MOVETYPE_WALK:
|
|
|
|
if (!SV_RunThink (ent))
|
|
|
|
return;
|
2005-03-28 00:11:59 +00:00
|
|
|
if (!SV_CheckWater (ent) && ! ((int)ent->v->flags & FL_WATERJUMP) )
|
2007-09-02 19:55:17 +00:00
|
|
|
SV_AddGravity (ent, ent->xv->gravity);
|
2004-08-23 00:15:46 +00:00
|
|
|
SV_CheckStuck (ent);
|
|
|
|
|
|
|
|
SV_WalkMove (ent);
|
|
|
|
|
2005-05-26 12:55:34 +00:00
|
|
|
if (!(ent->entnum > 0 && ent->entnum <= sv.allocated_client_slots))
|
2009-11-04 21:16:50 +00:00
|
|
|
World_LinkEdict (&sv.world, (wedict_t*)ent, true);
|
2005-05-26 12:55:34 +00:00
|
|
|
|
2004-08-23 00:15:46 +00:00
|
|
|
break;
|
2009-11-04 21:16:50 +00:00
|
|
|
case MOVETYPE_PHYSICS:
|
|
|
|
if (SV_RunThink(ent))
|
|
|
|
World_LinkEdict (&sv.world, (wedict_t*)ent, true);
|
|
|
|
break;
|
2004-08-23 00:15:46 +00:00
|
|
|
default:
|
2009-11-04 21:16:50 +00:00
|
|
|
SV_Error ("SV_Physics: bad movetype %i on %s", (int)ent->v->movetype, PR_GetString(svprogfuncs, ent->v->classname));
|
2004-08-23 00:15:46 +00:00
|
|
|
}
|
|
|
|
|
2009-11-04 21:16:50 +00:00
|
|
|
if (movechain != (edict_t*)sv.world.edicts)
|
2004-08-23 00:15:46 +00:00
|
|
|
{
|
2008-11-09 22:29:28 +00:00
|
|
|
SV_MoveChain(ent, movechain, initial_origin, initial_angle);
|
2004-08-23 00:15:46 +00:00
|
|
|
}
|
2005-06-22 17:10:13 +00:00
|
|
|
|
|
|
|
if (ent->entnum > 0 && ent->entnum <= sv.allocated_client_slots)
|
|
|
|
{
|
2009-11-04 21:16:50 +00:00
|
|
|
World_LinkEdict (&sv.world, (wedict_t*)ent, true);
|
2005-06-22 17:10:13 +00:00
|
|
|
|
2009-11-04 21:16:50 +00:00
|
|
|
pr_global_struct->time = sv.world.physicstime;
|
2005-06-22 17:10:13 +00:00
|
|
|
pr_global_struct->self = EDICT_TO_PROG(svprogfuncs, ent);
|
2007-09-02 19:55:17 +00:00
|
|
|
#ifdef VM_Q1
|
|
|
|
if (svs.gametype == GT_Q1QVM)
|
|
|
|
Q1QVM_PostThink();
|
|
|
|
else
|
|
|
|
#endif
|
|
|
|
{
|
|
|
|
if (pr_global_struct->PlayerPostThink)
|
|
|
|
PR_ExecuteProgram (svprogfuncs, pr_global_struct->PlayerPostThink);
|
|
|
|
}
|
2005-06-22 17:10:13 +00:00
|
|
|
}
|
2004-08-23 00:15:46 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
================
|
|
|
|
SV_RunNewmis
|
|
|
|
|
|
|
|
================
|
|
|
|
*/
|
|
|
|
void SV_RunNewmis (void)
|
|
|
|
{
|
|
|
|
edict_t *ent;
|
|
|
|
|
|
|
|
if (!realpr_nqglobal_struct.newmis) //newmis variable is not exported.
|
|
|
|
return;
|
|
|
|
|
2010-07-11 02:22:39 +00:00
|
|
|
if (sv_nomsec.ival >= 2)
|
2004-08-23 00:15:46 +00:00
|
|
|
return;
|
|
|
|
|
|
|
|
if (!pr_global_struct->newmis)
|
|
|
|
return;
|
|
|
|
ent = PROG_TO_EDICT(svprogfuncs, pr_global_struct->newmis);
|
|
|
|
host_frametime = 0.05;
|
|
|
|
pr_global_struct->newmis = 0;
|
2006-02-17 19:54:47 +00:00
|
|
|
|
|
|
|
SV_RunEntity (ent);
|
|
|
|
|
2004-08-23 00:15:46 +00:00
|
|
|
host_frametime = pr_global_struct->frametime;
|
|
|
|
}
|
|
|
|
|
2004-10-13 06:35:27 +00:00
|
|
|
trace_t SV_Trace_Toss (edict_t *tossent, edict_t *ignore)
|
|
|
|
{
|
|
|
|
int i;
|
|
|
|
float gravity;
|
|
|
|
vec3_t move, end;
|
|
|
|
trace_t trace;
|
|
|
|
|
|
|
|
vec3_t origin, velocity;
|
|
|
|
|
|
|
|
// this has to fetch the field from the original edict, since our copy is truncated
|
2007-09-02 19:55:17 +00:00
|
|
|
gravity = tossent->xv->gravity;
|
2004-10-13 06:35:27 +00:00
|
|
|
if (!gravity)
|
|
|
|
gravity = 1.0;
|
|
|
|
gravity *= sv_gravity.value * 0.05;
|
|
|
|
|
2005-03-28 00:11:59 +00:00
|
|
|
VectorCopy (tossent->v->origin, origin);
|
|
|
|
VectorCopy (tossent->v->velocity, velocity);
|
2004-10-13 06:35:27 +00:00
|
|
|
|
|
|
|
SV_CheckVelocity (tossent);
|
|
|
|
|
|
|
|
for (i = 0;i < 200;i++) // LordHavoc: sanity check; never trace more than 10 seconds
|
|
|
|
{
|
|
|
|
velocity[2] -= gravity;
|
|
|
|
VectorScale (velocity, 0.05, move);
|
|
|
|
VectorAdd (origin, move, end);
|
2009-11-04 21:16:50 +00:00
|
|
|
trace = World_Move (&sv.world, origin, tossent->v->mins, tossent->v->maxs, end, MOVE_NORMAL, (wedict_t*)tossent);
|
2004-10-13 06:35:27 +00:00
|
|
|
VectorCopy (trace.endpos, origin);
|
|
|
|
|
|
|
|
if (trace.fraction < 1 && trace.ent && trace.ent != ignore)
|
|
|
|
break;
|
|
|
|
|
|
|
|
if (Length(velocity) > sv_maxvelocity.value)
|
|
|
|
{
|
2005-03-28 00:11:59 +00:00
|
|
|
// Con_DPrintf("Slowing %s\n", PR_GetString(svprogfuncs, tossent->v->classname));
|
2004-10-13 06:35:27 +00:00
|
|
|
VectorScale (velocity, sv_maxvelocity.value/Length(velocity), velocity);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
trace.fraction = 0; // not relevant
|
|
|
|
return trace;
|
|
|
|
}
|
|
|
|
|
2004-08-23 00:15:46 +00:00
|
|
|
/*
|
|
|
|
================
|
|
|
|
SV_Physics
|
|
|
|
|
|
|
|
================
|
|
|
|
*/
|
|
|
|
qboolean SV_Physics (void)
|
|
|
|
{
|
|
|
|
int i;
|
2005-05-08 16:41:54 +00:00
|
|
|
qboolean retouch;
|
2004-08-23 00:15:46 +00:00
|
|
|
edict_t *ent;
|
2009-11-04 21:16:50 +00:00
|
|
|
qboolean moved = false;
|
2009-11-15 03:20:17 +00:00
|
|
|
int maxtics;
|
2004-08-23 00:15:46 +00:00
|
|
|
|
2005-03-07 08:58:26 +00:00
|
|
|
|
2009-03-03 01:52:30 +00:00
|
|
|
if (svs.gametype != GT_PROGS && svs.gametype != GT_Q1QVM && svs.gametype != GT_HALFLIFE) //make tics multiples of sv_maxtic (defaults to 0.1)
|
2004-08-23 00:15:46 +00:00
|
|
|
{
|
2009-11-04 21:16:50 +00:00
|
|
|
host_frametime = sv.time - sv.world.physicstime;
|
2005-08-11 04:14:33 +00:00
|
|
|
if (host_frametime<0)
|
|
|
|
{
|
|
|
|
if (host_frametime < -1)
|
2009-11-04 21:16:50 +00:00
|
|
|
sv.world.physicstime = sv.time;
|
2005-08-11 04:14:33 +00:00
|
|
|
host_frametime = 0;
|
|
|
|
}
|
2006-09-17 00:59:22 +00:00
|
|
|
if (svs.gametype != GT_QUAKE3)
|
2004-08-23 00:15:46 +00:00
|
|
|
if (host_frametime < sv_maxtic.value && realtime)
|
|
|
|
{
|
2005-08-11 04:14:33 +00:00
|
|
|
// sv.time+=host_frametime;
|
2009-11-04 21:16:50 +00:00
|
|
|
return false; //don't bother with the whole server thing for a bit longer
|
2004-08-23 00:15:46 +00:00
|
|
|
}
|
|
|
|
if (host_frametime > sv_maxtic.value)
|
|
|
|
host_frametime = sv_maxtic.value;
|
2009-11-04 21:16:50 +00:00
|
|
|
sv.world.physicstime = sv.time;
|
2004-08-23 00:15:46 +00:00
|
|
|
|
2005-03-07 08:58:26 +00:00
|
|
|
switch(svs.gametype)
|
|
|
|
{
|
|
|
|
#ifdef Q2SERVER
|
|
|
|
case GT_QUAKE2:
|
|
|
|
ge->RunFrame();
|
|
|
|
break;
|
|
|
|
#endif
|
|
|
|
#ifdef Q3SERVER
|
|
|
|
case GT_QUAKE3:
|
|
|
|
SVQ3_RunFrame();
|
|
|
|
break;
|
|
|
|
#endif
|
|
|
|
default:
|
|
|
|
break;
|
|
|
|
}
|
2009-11-04 21:16:50 +00:00
|
|
|
return true;
|
2004-08-23 00:15:46 +00:00
|
|
|
}
|
2005-03-07 08:58:26 +00:00
|
|
|
|
2009-03-03 01:52:30 +00:00
|
|
|
if (svs.gametype != GT_HALFLIFE && /*sv.botsonthemap &&*/ progstype == PROG_QW)
|
2007-10-02 15:17:22 +00:00
|
|
|
{
|
2007-10-14 01:52:42 +00:00
|
|
|
//DP_SV_BOTCLIENT - make the bots move with qw physics.
|
2007-10-02 15:17:22 +00:00
|
|
|
//They only move when there arn't any players on the server, but they should move at the right kind of speed if there are... hopefully
|
|
|
|
//they might just be a bit lagged. they will at least be as smooth as other players are.
|
|
|
|
|
|
|
|
usercmd_t ucmd;
|
|
|
|
static int old_bot_time; //I hate using floats for timers.
|
|
|
|
client_t *oldhost;
|
2007-10-05 10:44:36 +00:00
|
|
|
edict_t *oldplayer;
|
2007-10-02 15:25:26 +00:00
|
|
|
host_frametime = (Sys_Milliseconds() - old_bot_time) / 1000.0f;
|
2007-10-02 15:17:22 +00:00
|
|
|
if (1 || host_frametime >= 1 / 72.0f)
|
|
|
|
{
|
|
|
|
memset(&ucmd, 0, sizeof(ucmd));
|
|
|
|
old_bot_time = Sys_Milliseconds();
|
|
|
|
for (i = 1; i <= sv.allocated_client_slots; i++)
|
|
|
|
{
|
|
|
|
if (svs.clients[i-1].state && svs.clients[i-1].protocol == SCP_BAD)
|
|
|
|
{ //then this is a bot
|
2007-10-05 10:44:36 +00:00
|
|
|
oldhost = host_client;
|
|
|
|
oldplayer = sv_player;
|
|
|
|
host_client = &svs.clients[i-1];
|
|
|
|
sv_player = host_client->edict;
|
|
|
|
|
2007-10-08 12:23:55 +00:00
|
|
|
SV_PreRunCmd();
|
2007-10-05 10:44:36 +00:00
|
|
|
|
2007-10-14 20:32:21 +00:00
|
|
|
#ifdef SERVERONLY
|
2007-10-02 15:17:22 +00:00
|
|
|
ucmd.msec = host_frametime*1000;
|
2007-10-14 20:32:21 +00:00
|
|
|
#else
|
|
|
|
// FIXME: Something very weird is going on here!
|
|
|
|
ucmd.msec = 0;
|
|
|
|
#endif
|
2007-10-14 00:54:29 +00:00
|
|
|
ucmd.angles[0] = (int)(sv_player->v->angles[0] * (65535/360.0f));
|
|
|
|
ucmd.angles[1] = (int)(sv_player->v->angles[1] * (65535/360.0f));
|
|
|
|
ucmd.angles[2] = (int)(sv_player->v->angles[2] * (65535/360.0f));
|
2007-10-05 10:44:36 +00:00
|
|
|
ucmd.forwardmove = sv_player->xv->movement[0];
|
|
|
|
ucmd.sidemove = sv_player->xv->movement[1];
|
|
|
|
ucmd.upmove = sv_player->xv->movement[2];
|
|
|
|
ucmd.buttons = (sv_player->v->button0?1:0) | (sv_player->v->button2?2:0);
|
2007-10-02 15:17:22 +00:00
|
|
|
|
|
|
|
svs.clients[i-1].lastcmd = ucmd; //allow the other clients to predict this bot.
|
|
|
|
|
|
|
|
SV_RunCmd(&ucmd, false);
|
|
|
|
SV_PostRunCmd();
|
2007-10-11 13:31:31 +00:00
|
|
|
|
2007-10-02 15:17:22 +00:00
|
|
|
host_client = oldhost;
|
2007-10-05 10:44:36 +00:00
|
|
|
sv_player = oldplayer;
|
2007-10-02 15:17:22 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
old_bot_time = Sys_Milliseconds();
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2009-11-15 03:20:17 +00:00
|
|
|
maxtics = sv_limittics.ival;
|
|
|
|
|
2004-08-23 00:15:46 +00:00
|
|
|
// don't bother running a frame if sys_ticrate seconds haven't passed
|
2009-03-03 01:52:30 +00:00
|
|
|
while (1)
|
|
|
|
{
|
2009-11-04 21:16:50 +00:00
|
|
|
host_frametime = sv.time - sv.world.physicstime;
|
2009-03-03 01:52:30 +00:00
|
|
|
if (host_frametime < 0)
|
|
|
|
{
|
2009-11-04 21:16:50 +00:00
|
|
|
sv.world.physicstime = sv.time;
|
2009-03-03 01:52:30 +00:00
|
|
|
break;
|
|
|
|
}
|
|
|
|
if (host_frametime <= 0 || host_frametime < sv_mintic.value)
|
|
|
|
break;
|
2009-11-15 03:20:17 +00:00
|
|
|
if (host_frametime > sv_maxtic.value)
|
2009-03-03 01:52:30 +00:00
|
|
|
{
|
Fixes, workarounds, and breakages. Hexen2 should work much better (-hexen2 says no mission pack, -portals says h2mp). Started working on splitting bigcoords per client, far too much work still to go on that. Removed gl_ztrick entirely. Enabled csprogs download by default. Added client support for fitzquake's 666 protocol, needs testing, some cleanup for dp protocols too, no server support, couldn't selectively enable it anyway. Now attempting to cache shadow meshes for explosions and stuff. Played with lightmaps a little, should potentially run a little faster on certain (intel?) cards. Tweeked npfte a little to try to avoid deadlocks and crashes. Fixed sky worldspawn parsing. Added h2mp's model format. Fixed baseline issue in q2 client, made servers generate q2 baselines. MOVETYPE_PUSH will not rotate extra if rotation is forced. Made status command show allowed client types. Changed lighting on weapons - should now be shaded.
git-svn-id: https://svn.code.sf.net/p/fteqw/code/branches/wip@3572 fc73d0e0-1445-4013-8a0c-d673dee63da5
2010-08-11 03:36:31 +00:00
|
|
|
if (maxtics-- <= 0)
|
2009-11-15 03:20:17 +00:00
|
|
|
{
|
|
|
|
//timewarp, as we're running too slowly
|
|
|
|
sv.world.physicstime = sv.time;
|
|
|
|
break;
|
|
|
|
}
|
2009-03-03 01:52:30 +00:00
|
|
|
host_frametime = sv_maxtic.value;
|
|
|
|
}
|
2010-07-25 15:09:13 +00:00
|
|
|
if (!host_frametime)
|
|
|
|
continue;
|
2009-11-15 03:20:17 +00:00
|
|
|
sv.world.physicstime += host_frametime;
|
2005-05-26 12:55:34 +00:00
|
|
|
|
2009-11-04 21:16:50 +00:00
|
|
|
moved = true;
|
|
|
|
|
2009-03-03 01:52:30 +00:00
|
|
|
#ifdef HLSERVER
|
|
|
|
if (svs.gametype == GT_HALFLIFE)
|
|
|
|
{
|
|
|
|
SVHL_RunFrame();
|
|
|
|
continue;
|
|
|
|
}
|
|
|
|
#endif
|
2004-08-23 00:15:46 +00:00
|
|
|
|
2009-03-03 01:52:30 +00:00
|
|
|
pr_global_struct->frametime = host_frametime;
|
2004-08-23 00:15:46 +00:00
|
|
|
|
2009-03-03 01:52:30 +00:00
|
|
|
SV_ProgStartFrame ();
|
2004-08-23 00:15:46 +00:00
|
|
|
|
2009-11-04 21:16:50 +00:00
|
|
|
#ifdef USEODE
|
|
|
|
World_Physics_Frame(&sv.world, host_frametime, sv_gravity.value);
|
|
|
|
#endif
|
|
|
|
|
2010-12-18 17:02:47 +00:00
|
|
|
PRSV_RunThreads();
|
2005-05-08 16:41:54 +00:00
|
|
|
|
|
|
|
|
2009-03-03 01:52:30 +00:00
|
|
|
retouch = (pr_nqglobal_struct->force_retouch && *pr_nqglobal_struct->force_retouch);
|
2004-08-23 00:15:46 +00:00
|
|
|
|
2009-03-03 01:52:30 +00:00
|
|
|
//
|
|
|
|
// treat each object in turn
|
|
|
|
// even the world gets a chance to think
|
|
|
|
//
|
2009-11-04 21:16:50 +00:00
|
|
|
for (i=0 ; i<sv.world.num_edicts ; i++)
|
2004-08-23 00:15:46 +00:00
|
|
|
{
|
2009-03-03 01:52:30 +00:00
|
|
|
ent = EDICT_NUM(svprogfuncs, i);
|
|
|
|
if (ent->isfree)
|
|
|
|
continue;
|
2004-08-23 00:15:46 +00:00
|
|
|
|
2010-07-12 22:46:37 +00:00
|
|
|
if (retouch)
|
2009-11-04 21:16:50 +00:00
|
|
|
World_LinkEdict (&sv.world, (wedict_t*)ent, true); // force retouch even for stationary
|
2004-08-23 00:15:46 +00:00
|
|
|
|
2009-03-03 01:52:30 +00:00
|
|
|
if (i > 0 && i <= sv.allocated_client_slots)
|
|
|
|
{
|
|
|
|
if (!svs.clients[i-1].isindependant)
|
|
|
|
{
|
|
|
|
SV_RunEntity(ent);
|
|
|
|
SV_RunNewmis ();
|
|
|
|
}
|
|
|
|
else
|
2009-11-04 21:16:50 +00:00
|
|
|
World_LinkEdict(&sv.world, (wedict_t*)ent, true);
|
2009-03-03 01:52:30 +00:00
|
|
|
continue; // clients are run directly from packets
|
|
|
|
}
|
|
|
|
|
|
|
|
SV_RunEntity (ent);
|
|
|
|
SV_RunNewmis ();
|
2010-07-12 22:46:37 +00:00
|
|
|
|
2010-11-20 22:01:16 +00:00
|
|
|
if (ent->solidtype != ent->v->solid && !ent->isfree)
|
2010-07-12 22:46:37 +00:00
|
|
|
{
|
|
|
|
Con_DPrintf("Entity \"%s\" improperly changed solid type\n", PR_GetString(svprogfuncs, ent->v->classname));
|
|
|
|
World_LinkEdict (&sv.world, (wedict_t*)ent, true); // a change of solidity should always relink the edict. someone messed up.
|
|
|
|
}
|
2009-03-03 01:52:30 +00:00
|
|
|
}
|
2006-02-17 19:54:47 +00:00
|
|
|
|
2009-03-03 01:52:30 +00:00
|
|
|
if (retouch)
|
|
|
|
pr_global_struct->force_retouch-=1;
|
2004-08-23 00:15:46 +00:00
|
|
|
|
2007-09-02 19:55:17 +00:00
|
|
|
#ifdef VM_Q1
|
2009-03-03 01:52:30 +00:00
|
|
|
if (svs.gametype == GT_Q1QVM)
|
|
|
|
{
|
2009-11-04 21:16:50 +00:00
|
|
|
pr_global_struct->self = EDICT_TO_PROG(svprogfuncs, sv.world.edicts);
|
|
|
|
pr_global_struct->other = EDICT_TO_PROG(svprogfuncs, sv.world.edicts);
|
|
|
|
pr_global_struct->time = sv.world.physicstime;
|
2009-03-03 01:52:30 +00:00
|
|
|
Q1QVM_EndFrame();
|
|
|
|
}
|
|
|
|
else
|
2007-09-02 19:55:17 +00:00
|
|
|
#endif
|
2009-03-03 01:52:30 +00:00
|
|
|
if (EndFrameQC)
|
|
|
|
{
|
2009-11-04 21:16:50 +00:00
|
|
|
pr_global_struct->self = EDICT_TO_PROG(svprogfuncs, sv.world.edicts);
|
|
|
|
pr_global_struct->other = EDICT_TO_PROG(svprogfuncs, sv.world.edicts);
|
|
|
|
pr_global_struct->time = sv.world.physicstime;
|
2009-03-03 01:52:30 +00:00
|
|
|
PR_ExecuteProgram (svprogfuncs, EndFrameQC);
|
|
|
|
}
|
|
|
|
|
|
|
|
NPP_Flush(); //flush it just in case there was an error and we stopped preparsing. This is only really needed while debugging.
|
2004-08-23 00:15:46 +00:00
|
|
|
|
2009-03-03 01:52:30 +00:00
|
|
|
}
|
2009-11-04 21:16:50 +00:00
|
|
|
return moved;
|
2004-08-23 00:15:46 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
void SV_SetMoveVars(void)
|
|
|
|
{
|
2006-02-17 19:54:47 +00:00
|
|
|
movevars.gravity = sv_gravity.value;
|
|
|
|
movevars.stopspeed = sv_stopspeed.value;
|
|
|
|
movevars.maxspeed = sv_maxspeed.value;
|
|
|
|
movevars.spectatormaxspeed = sv_spectatormaxspeed.value;
|
|
|
|
movevars.accelerate = sv_accelerate.value;
|
|
|
|
movevars.airaccelerate = sv_airaccelerate.value;
|
|
|
|
movevars.wateraccelerate = sv_wateraccelerate.value;
|
|
|
|
movevars.friction = sv_friction.value;
|
|
|
|
movevars.waterfriction = sv_waterfriction.value;
|
2004-08-23 00:15:46 +00:00
|
|
|
movevars.entgravity = 1.0;
|
2007-07-23 11:44:45 +00:00
|
|
|
if (*pm_stepheight.string)
|
|
|
|
movevars.stepheight = pm_stepheight.value;
|
|
|
|
else
|
|
|
|
movevars.stepheight = PM_DEFAULTSTEPHEIGHT;
|
2004-08-23 00:15:46 +00:00
|
|
|
}
|
2004-12-09 23:47:43 +00:00
|
|
|
#endif
|