From 58be666c9ce39df72da06902bc8d7e1efd29a0ca Mon Sep 17 00:00:00 2001
From: Christoph Oelckers <coelckers@zdoom.fake>
Date: Sat, 24 Jul 2010 06:15:07 +0000
Subject: [PATCH] =?UTF-8?q?-=20added=20David=C3=9CH's=20explicit=20angle?=
 =?UTF-8?q?=20submission=20for=20A=5FCustomBulletAttack=20function.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

SVN r2452 (trunk)
---
 src/thingdef/thingdef_codeptr.cpp  | 17 +++++++++++++++--
 wadsrc/static/actors/constants.txt |  1 +
 2 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/src/thingdef/thingdef_codeptr.cpp b/src/thingdef/thingdef_codeptr.cpp
index 406d8d7591..69333c75f8 100644
--- a/src/thingdef/thingdef_codeptr.cpp
+++ b/src/thingdef/thingdef_codeptr.cpp
@@ -825,6 +825,7 @@ enum CBA_Flags
 {
 	CBAF_AIMFACING = 1,
 	CBAF_NORANDOM = 2,
+	CBAF_EXPLICITANGLE = 4,
 };
 
 DEFINE_ACTION_FUNCTION_PARAMS(AActor, A_CustomBulletAttack)
@@ -856,8 +857,20 @@ DEFINE_ACTION_FUNCTION_PARAMS(AActor, A_CustomBulletAttack)
 		S_Sound (self, CHAN_WEAPON, self->AttackSound, 1, ATTN_NORM);
 		for (i=0 ; i<NumBullets ; i++)
 		{
-			int angle = bangle + pr_cabullet.Random2() * (Spread_XY / 255);
-			int slope = bslope + pr_cabullet.Random2() * (Spread_Z / 255);
+			int angle = bangle;
+			int slope = bslope;
+
+			if (Flags & CBAF_EXPLICITANGLE)
+			{
+				angle += Spread_XY;
+				slope += Spread_Z;
+			}
+			else
+			{
+				angle += pr_cwbullet.Random2() * (Spread_XY / 255);
+				slope += pr_cwbullet.Random2() * (Spread_Z / 255);
+			}
+
 			int damage = DamagePerBullet;
 
 			if (!(Flags & CBAF_NORANDOM))
diff --git a/wadsrc/static/actors/constants.txt b/wadsrc/static/actors/constants.txt
index f03ad34a60..ab26306885 100644
--- a/wadsrc/static/actors/constants.txt
+++ b/wadsrc/static/actors/constants.txt
@@ -8,6 +8,7 @@ const int CMF_CHECKTARGETDEAD = 8;
 // Flags for A_CustomBulletAttack
 const int CBAF_AIMFACING = 1;
 const int CBAF_NORANDOM = 2;
+const int CBAF_EXPLICITANGLE = 4;
 
 // Flags for A_FireBullets
 const int FBF_USEAMMO = 1;