From fdf2d6c493ea898e13e1b92b145566949f1ac38b Mon Sep 17 00:00:00 2001
From: MajorCooke <paul.growney22@gmail.com>
Date: Sat, 27 Dec 2014 12:47:48 -0600
Subject: [PATCH] - Cleaned up some of the reflective code. - Added null checks
 to AIMREFLECT. - The missile being reflected now corrects the z velocity to
 perfectly reflect towards the actor's middle.

---
 src/p_mobj.cpp | 79 ++++++++++++++++++++++++++++----------------------
 1 file changed, 45 insertions(+), 34 deletions(-)

diff --git a/src/p_mobj.cpp b/src/p_mobj.cpp
index 8c76d793e8..a88ec65159 100644
--- a/src/p_mobj.cpp
+++ b/src/p_mobj.cpp
@@ -1961,48 +1961,50 @@ fixed_t P_XYMovement (AActor *mo, fixed_t scrollx, fixed_t scrolly)
 					// Don't change the angle if there's THRUREFLECT on the monster.
 					if (!(BlockingMobj->flags7 & MF7_THRUREFLECT))
 					{
-						int dir;
-						angle_t delta;
-						
-						if (BlockingMobj->flags7 & MF7_MIRRORREFLECT)
-							angle = mo->angle + ANG180;
-						else
-							angle = R_PointToAngle2(BlockingMobj->x, BlockingMobj->y, mo->x, mo->y);
-
+						//int dir;
+						//angle_t delta;
+						bool dontReflect = (mo->AdjustReflectionAngle(BlockingMobj, angle));
 						// Change angle for deflection/reflection
-						// AIMREFLECT calls precedence so make sure not to bother with adjusting here if declared.
-						if (!(BlockingMobj->flags7 & MF7_AIMREFLECT) && (mo->AdjustReflectionAngle(BlockingMobj, angle)))
-						{
-							goto explode;
-						}
 
-						// Reflect the missile along angle
-						if (BlockingMobj->flags7 & MF7_AIMREFLECT)
+						if (!dontReflect)
 						{
-							dir = P_FaceMobj(mo, mo->target, &delta);
-							if (dir)
-							{ // Turn clockwise
-								mo->angle += delta;
+							bool tg = (mo->target != NULL);
+							bool blockingtg = (BlockingMobj->target != NULL);
+							if (BlockingMobj->flags7 & MF7_AIMREFLECT && (tg || blockingtg))
+							{
+								AActor *origin;
+								if (tg)
+									origin = mo->target;
+								else if (blockingtg)
+									origin = BlockingMobj->target;
+
+								float speed = (float)(mo->Speed);
+								//dest->x - source->x
+								FVector3 velocity(origin->x - mo->x, origin->y - mo->y, (origin->z + (origin->height/2)) - mo->z);
+								velocity.Resize(speed);
+								angle = mo->angle >> ANGLETOFINESHIFT;
+								mo->velx = (fixed_t)(velocity.X);
+								mo->vely = (fixed_t)(velocity.Y);
+								mo->velz = (fixed_t)(velocity.Z);
+								/*
+								mo->velx = FixedMul(mo->Speed, finecosine[angle]);
+								mo->vely = FixedMul(mo->Speed, finesine[angle]);
+								mo->velz = -mo->velz;
+								*/
 							}
 							else
-							{ // Turn counter clockwise
-								mo->angle -= delta;
+							{
+								mo->angle = angle;
+								angle >>= ANGLETOFINESHIFT;
+								mo->velx = FixedMul(mo->Speed >> 1, finecosine[angle]);
+								mo->vely = FixedMul(mo->Speed >> 1, finesine[angle]);
+								mo->velz = -mo->velz / 2;
 							}
-							angle = mo->angle >> ANGLETOFINESHIFT;
-							mo->velx = FixedMul(mo->Speed, finecosine[angle]);
-							mo->vely = FixedMul(mo->Speed, finesine[angle]);
-							mo->velz = -mo->velz;
 						}
 						else
 						{
-							mo->angle = angle;
-							angle >>= ANGLETOFINESHIFT;
-							mo->velx = FixedMul(mo->Speed >> 1, finecosine[angle]);
-							mo->vely = FixedMul(mo->Speed >> 1, finesine[angle]);
-							mo->velz = -mo->velz / 2;
-						}
-						
-						
+							goto explode;
+						}						
 					}
 					if (mo->flags2 & MF2_SEEKERMISSILE)
 					{
@@ -2928,8 +2930,10 @@ bool AActor::AdjustReflectionAngle (AActor *thing, angle_t &angle)
 	if (flags2 & MF2_DONTREFLECT) return true;
 	if (thing->flags7 & MF7_THRUREFLECT) return false;
 
+	if (thing->flags7 & MF7_MIRRORREFLECT)
+		angle += ANGLE_180;
 	// Change angle for reflection
-	if (thing->flags4&MF4_SHIELDREFLECT)
+	else if (thing->flags4&MF4_SHIELDREFLECT)
 	{
 		// Shield reflection (from the Centaur
 		if (abs (angle - thing->angle)>>24 > 45)
@@ -2952,6 +2956,13 @@ bool AActor::AdjustReflectionAngle (AActor *thing, angle_t &angle)
 		else 
 			angle -= ANG45;
 	}
+	else if (thing->flags7 & MF7_AIMREFLECT)
+	{
+		if (this->target != NULL)
+			A_Face(this, this->target);
+		else if (thing->target != NULL)
+			A_Face(this, thing->target);
+	}
 	else 
 		angle += ANGLE_1 * ((pr_reflect()%16)-8);
 	return false;