From cbe11657f008e96506ae7a1fa7af633ad8d635fa Mon Sep 17 00:00:00 2001 From: Randy Heit Date: Wed, 10 Apr 2013 00:13:55 +0000 Subject: [PATCH] - Fixed: A_Face should take into account the target's height when aiming pitch. SVN r4214 (trunk) --- src/p_enemy.cpp | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/src/p_enemy.cpp b/src/p_enemy.cpp index dd5ab581b..dc96eb8ac 100644 --- a/src/p_enemy.cpp +++ b/src/p_enemy.cpp @@ -2792,7 +2792,16 @@ void A_Face (AActor *self, AActor *other, angle_t max_turn, angle_t max_pitch) // result is only used in a ratio. double dist_x = self->target->x - self->x; double dist_y = self->target->y - self->y; - double dist_z = self->target->z - self->z; + // Positioning ala missile spawning, 32 units above foot level + fixed_t source_z = self->z + 32*FRACUNIT + self->GetBobOffset(); + fixed_t target_z = self->target->z + 32*FRACUNIT + self->target->GetBobOffset(); + // If the target z is above the target's head, reposition to the middle of + // its body. + if (target_z >= self->target->z + self->target->height) + { + target_z = self->target->z + self->target->height / 2; + } + double dist_z = target_z - source_z; double dist = sqrt(dist_x*dist_x + dist_y*dist_y + dist_z*dist_z); int other_pitch = (int)rad2bam(asin(dist_z / dist));