nzp-team
/
fteqw
mirror of https://github.com/nzp-team/fteqw.git
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Small pointless cleanup. 

git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@1834 fc73d0e0-1445-4013-8a0c-d673dee63da5
This commit is contained in:
Spoike 2006-01-10 18:47:19 +00:00
parent d4ccc2bdf8
commit a94b2f19c9
1 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
engine/server/sv_move.c
View File

@ -312,7 +312,6 @@ SV_NewChaseDir
*/ */
#define DI_NODIR -1 #define DI_NODIR -1
#define NEWSV_StepDirection(x, y, z, s) SV_StepDirection(x, y, z, s)
void SV_NewChaseDir (edict_t *actor, edict_t *enemy, float dist, struct globalvars_s *pr_globals) void SV_NewChaseDir (edict_t *actor, edict_t *enemy, float dist, struct globalvars_s *pr_globals)
{ {
float deltax,deltay; float deltax,deltay;
@ -345,7 +344,7 @@ void SV_NewChaseDir (edict_t *actor, edict_t *enemy, float dist, struct globalva
else else
tdir = d[2] == 90 ? 135 : 215; tdir = d[2] == 90 ? 135 : 215;
if (tdir != turnaround && NEWSV_StepDirection(actor, tdir, dist, pr_globals)) if (tdir != turnaround && SV_StepDirection(actor, tdir, dist, pr_globals))
return; return;
} }
@ -358,32 +357,32 @@ void SV_NewChaseDir (edict_t *actor, edict_t *enemy, float dist, struct globalva
} }
if (d[1]!=DI_NODIR && d[1]!=turnaround if (d[1]!=DI_NODIR && d[1]!=turnaround
&& NEWSV_StepDirection(actor, d[1], dist, pr_globals)) && SV_StepDirection(actor, d[1], dist, pr_globals))
return; return;
if (d[2]!=DI_NODIR && d[2]!=turnaround if (d[2]!=DI_NODIR && d[2]!=turnaround
&& NEWSV_StepDirection(actor, d[2], dist, pr_globals)) && SV_StepDirection(actor, d[2], dist, pr_globals))
return; return;
/* there is no direct path to the player, so pick another direction */ /* there is no direct path to the player, so pick another direction */
if (olddir!=DI_NODIR && NEWSV_StepDirection(actor, olddir, dist, pr_globals)) if (olddir!=DI_NODIR && SV_StepDirection(actor, olddir, dist, pr_globals))
return; return;
if (rand()&1) /*randomly determine direction of search*/ if (rand()&1) /*randomly determine direction of search*/
{ {
for (tdir=0 ; tdir<=315 ; tdir += 45) for (tdir=0 ; tdir<=315 ; tdir += 45)
if (tdir!=turnaround && NEWSV_StepDirection(actor, tdir, dist, pr_globals) ) if (tdir!=turnaround && SV_StepDirection(actor, tdir, dist, pr_globals) )
return; return;
} }
else else
{ {
for (tdir=315 ; tdir >=0 ; tdir -= 45) for (tdir=315 ; tdir >=0 ; tdir -= 45)
if (tdir!=turnaround && NEWSV_StepDirection(actor, tdir, dist, pr_globals) ) if (tdir!=turnaround && SV_StepDirection(actor, tdir, dist, pr_globals) )
return; return;
} }
if (turnaround != DI_NODIR && NEWSV_StepDirection(actor, turnaround, dist, pr_globals) ) if (turnaround != DI_NODIR && SV_StepDirection(actor, turnaround, dist, pr_globals) )
return; return;
actor->v->ideal_yaw = olddir; // can't move actor->v->ideal_yaw = olddir; // can't move
@ -443,7 +442,7 @@ void SV_MoveToGoal (progfuncs_t *prinst, struct globalvars_s *pr_globals)
// bump around... // bump around...
if ( (rand()&3)==1 || if ( (rand()&3)==1 ||
!NEWSV_StepDirection (ent, ent->v->ideal_yaw, dist, pr_globals)) !SV_StepDirection (ent, ent->v->ideal_yaw, dist, pr_globals))
{ {
SV_NewChaseDir (ent, goal, dist, pr_globals); SV_NewChaseDir (ent, goal, dist, pr_globals);
} }