yquake2/xatrix
0
0
Fork 0
mirror of https://github.com/yquake2/xatrix.git synced 2025-04-26 03:41:17 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #27 from BjossiAlfreds/fixbot-heal

Browse source 
Fixbot telefrag check fixed
This commit is contained in:
Yamagi 2019-09-23 13:52:54 +02:00 committed by GitHub
commit c2ba853d51
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 13 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
src/monster/fixbot/fixbot.c
View file

@ -1099,8 +1099,7 @@ mmove_t fixbot_move_attack1 = {
int int
check_telefrag(edict_t *self) check_telefrag(edict_t *self)
{ {
vec3_t start = {0, 0, 0}; vec3_t end, up;
vec3_t forward, right, up;
trace_t tr; trace_t tr;
if (!self) if (!self)
@ -1108,14 +1107,20 @@ check_telefrag(edict_t *self)
return 0; return 0;
} }
AngleVectors(self->enemy->s.angles, forward, right, up); AngleVectors(self->enemy->s.angles, NULL, NULL, up);
VectorMA(start, 48, up, start); VectorMA(self->enemy->s.origin, 48, up, end);
tr = gi.trace(self->enemy->s.origin, self->enemy->mins, self->enemy->maxs,
start, self, MASK_MONSTERSOLID);
if (tr.ent->takedamage) tr = gi.trace(self->enemy->s.origin, self->enemy->mins, self->enemy->maxs,
end, self, MASK_MONSTERSOLID);
if (tr.ent && tr.ent->takedamage)
{ {
tr.ent->health = -1000; tr.ent->health = 0;
T_Damage(tr.ent, self, self,
vec3_origin, vec3_origin, vec3_origin,
10000, 0, 0, MOD_UNKNOWN);
return 0; return 0;
} }