1
0
Fork 0
forked from fte/fteqw

try to fix a clientonly-with-csqc build issue.

git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@3962 fc73d0e0-1445-4013-8a0c-d673dee63da5
This commit is contained in:
Spoike 2012-01-25 04:11:27 +00:00
parent 567e9f112b
commit c1db4356f7

View file

@ -123,7 +123,9 @@ qboolean World_movestep (world_t *world, wedict_t *ent, vec3_t move, qboolean re
wedict_t *enemy = world->edicts; wedict_t *enemy = world->edicts;
int eflags = ent->v->flags; int eflags = ent->v->flags;
if (progstype != PROG_H2) #ifndef CLIENTONLY
if (progstype != PROG_H2 || world != &sv.world)
#endif
eflags &= ~FLH2_NOZ|FLH2_HUNTFACE; eflags &= ~FLH2_NOZ|FLH2_HUNTFACE;
// try the move // try the move
@ -131,7 +133,7 @@ qboolean World_movestep (world_t *world, wedict_t *ent, vec3_t move, qboolean re
VectorAdd (ent->v->origin, move, neworg); VectorAdd (ent->v->origin, move, neworg);
// flying monsters don't step up // flying monsters don't step up
if ( eflags & (FL_SWIM | FL_FLY) && !(eflags & (FLH2_NOZ|FLH2_HUNTFACE))) if ((eflags & (FL_SWIM | FL_FLY)) && !(eflags & (FLH2_NOZ|FLH2_HUNTFACE)))
{ {
// try one move with vertical motion, then one without // try one move with vertical motion, then one without
for (i=0 ; i<2 ; i++) for (i=0 ; i<2 ; i++)