From b8b81e9809fb1fb7a0e727810f117fddb55e3da9 Mon Sep 17 00:00:00 2001
From: John Palomo Jr <palomo.john@hotmail.com>
Date: Fri, 1 Jan 2016 13:27:44 -0500
Subject: [PATCH 1/4] Added turn180 to the controls menu.

---
 wadsrc/static/menudef.txt | 1 +
 1 file changed, 1 insertion(+)

diff --git a/wadsrc/static/menudef.txt b/wadsrc/static/menudef.txt
index 087c067d14..add8444557 100644
--- a/wadsrc/static/menudef.txt
+++ b/wadsrc/static/menudef.txt
@@ -448,6 +448,7 @@ OptionMenu "CustomizeControls"
 	Control 	"Strafe right",			"+moveright"
 	Control 	"Turn left",			"+left"
 	Control 	"Turn right",			"+right"
+	Control		"Quick Turn",			"turn180"
 	Control 	"Jump",					"+jump"
 	Control 	"Crouch",				"+crouch"
 	Control 	"Crouch Toggle",		"crouch"

From c9afb199caf363e1387bd9111b31137d5c44d972 Mon Sep 17 00:00:00 2001
From: Benjamin Moir <bennyboy.private@hotmail.com.au>
Date: Tue, 5 Jan 2016 13:58:00 +1000
Subject: [PATCH 2/4] Added "pufftid" parameter for LineAttack.

---
 src/p_acs.cpp | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

diff --git a/src/p_acs.cpp b/src/p_acs.cpp
index b94d63b795..f9744884c5 100644
--- a/src/p_acs.cpp
+++ b/src/p_acs.cpp
@@ -5397,6 +5397,7 @@ int DLevelScript::CallFunction(int argCount, int funcIndex, SDWORD *args, const
 				FName damagetype	= argCount > 5 && args[5]? FName(FBehavior::StaticLookupString(args[5])) : NAME_None;
 				fixed_t	range		= argCount > 6 && args[6]? args[6] : MISSILERANGE;
 				int flags			= argCount > 7 && args[7]? args[7] : 0;
+				int pufftid			= argCount > 8 && args[8]? args[8] : 0;
 
 				int fhflags = 0;
 				if (flags & FHF_NORANDOMPUFFZ) fhflags |= LAF_NORANDOMPUFFZ;
@@ -5404,7 +5405,12 @@ int DLevelScript::CallFunction(int argCount, int funcIndex, SDWORD *args, const
 
 				if (args[0] == 0)
 				{
-					P_LineAttack(activator, angle, range, pitch, damage, damagetype, pufftype, fhflags);
+					AActor *puff = P_LineAttack(activator, angle, range, pitch, damage, damagetype, pufftype, fhflags);
+					if (pufftid != 0)
+					{
+						puff->tid = pufftid;
+						puff->AddToHash();
+					}
 				}
 				else
 				{
@@ -5413,7 +5419,12 @@ int DLevelScript::CallFunction(int argCount, int funcIndex, SDWORD *args, const
 
 					while ((source = it.Next()) != NULL)
 					{
-						P_LineAttack(source, angle, range, pitch, damage, damagetype, pufftype, fhflags);
+						AActor *puff = P_LineAttack(source, angle, range, pitch, damage, damagetype, pufftype, fhflags);
+						if (pufftid != 0)
+						{
+							puff->tid = pufftid;
+							puff->AddToHash();
+						}
 					}
 				}
 			}

From b2f860d7ae6842ab0bdf168f6b2bb4a03bf5e9b0 Mon Sep 17 00:00:00 2001
From: Christoph Oelckers <c.oelckers@zdoom.fake>
Date: Tue, 5 Jan 2016 11:07:59 +0100
Subject: [PATCH 3/4] - better add a NULL pointer check here.

---
 src/p_acs.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/p_acs.cpp b/src/p_acs.cpp
index f9744884c5..663d316dcb 100644
--- a/src/p_acs.cpp
+++ b/src/p_acs.cpp
@@ -5406,7 +5406,7 @@ int DLevelScript::CallFunction(int argCount, int funcIndex, SDWORD *args, const
 				if (args[0] == 0)
 				{
 					AActor *puff = P_LineAttack(activator, angle, range, pitch, damage, damagetype, pufftype, fhflags);
-					if (pufftid != 0)
+					if (puff != NULL && pufftid != 0)
 					{
 						puff->tid = pufftid;
 						puff->AddToHash();
@@ -5420,7 +5420,7 @@ int DLevelScript::CallFunction(int argCount, int funcIndex, SDWORD *args, const
 					while ((source = it.Next()) != NULL)
 					{
 						AActor *puff = P_LineAttack(source, angle, range, pitch, damage, damagetype, pufftype, fhflags);
-						if (pufftid != 0)
+						if (puff != NULL && pufftid != 0)
 						{
 							puff->tid = pufftid;
 							puff->AddToHash();

From 99bf01365249f3db6ef3ea266c1a95f792aa40f2 Mon Sep 17 00:00:00 2001
From: Christoph Oelckers <c.oelckers@zdoom.fake>
Date: Tue, 5 Jan 2016 11:16:38 +0100
Subject: [PATCH 4/4] - added new IWAD name HERETICSR.WAD so that commercial
 Heretic and Shadows of the Serpent Riders can coexist.

---
 wadsrc/static/iwadinfo.txt | 1 +
 1 file changed, 1 insertion(+)

diff --git a/wadsrc/static/iwadinfo.txt b/wadsrc/static/iwadinfo.txt
index 6c958ddfa2..401f3ca4c0 100644
--- a/wadsrc/static/iwadinfo.txt
+++ b/wadsrc/static/iwadinfo.txt
@@ -370,6 +370,7 @@ Names
 	"doom.wad"
 	"doom1.wad"
 	"heretic.wad"
+	"hereticsr.wad"
 	"heretic1.wad"
 	"hexen.wad"
 	"hexdd.wad"