From 3c1fa3bed961a39ce18f0e77349ae5e75a29edf0 Mon Sep 17 00:00:00 2001
From: Christoph Oelckers <c.oelckers@zdoom.fake>
Date: Wed, 29 Apr 2015 00:19:21 +0200
Subject: [PATCH 1/2] - fixed some GCC warnings.

---
 src/p_tags.cpp          | 4 ++--
 src/sound/fmodsound.cpp | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/p_tags.cpp b/src/p_tags.cpp
index d5c03ec9d..e773b691f 100644
--- a/src/p_tags.cpp
+++ b/src/p_tags.cpp
@@ -314,7 +314,7 @@ int FSectorTagIterator::Next()
 		while (start >= 0 && tagManager.allTags[start].tag != searchtag) start = tagManager.allTags[start].nexttag;
 		if (start == -1) return -1;
 		ret = tagManager.allTags[start].target;
-		start = start = tagManager.allTags[start].nexttag;
+		start = tagManager.allTags[start].nexttag;
 	}
 	return ret;
 }
@@ -348,6 +348,6 @@ int FLineIdIterator::Next()
 	while (start >= 0 && tagManager.allIDs[start].tag != searchtag) start = tagManager.allIDs[start].nexttag;
 	if (start == -1) return -1;
 	int ret = tagManager.allIDs[start].target;
-	start = start = tagManager.allIDs[start].nexttag;
+	start = tagManager.allIDs[start].nexttag;
 	return ret;
 }
diff --git a/src/sound/fmodsound.cpp b/src/sound/fmodsound.cpp
index 73e419555..8433b301b 100644
--- a/src/sound/fmodsound.cpp
+++ b/src/sound/fmodsound.cpp
@@ -304,7 +304,7 @@ class FMODStreamCapsule : public SoundStream
 public:
 	FMODStreamCapsule(FMOD::Sound *stream, FMODSoundRenderer *owner, const char *url)
 		: Owner(owner), Stream(NULL), Channel(NULL),
-		  UserData(NULL), Callback(NULL), URL(url), Reader(NULL), Ended(false)
+		  UserData(NULL), Callback(NULL), Reader(NULL), URL(url), Ended(false)
 	{
 		SetStream(stream);
 	}

From 7d90c65427be37c94176c630f6200d81f7663ffa Mon Sep 17 00:00:00 2001
From: Christoph Oelckers <c.oelckers@zdoom.fake>
Date: Wed, 29 Apr 2015 08:42:54 +0200
Subject: [PATCH 2/2] - mask out Strife mapthing flags when starting an
 original Hexen map.

---
 src/p_setup.cpp | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/p_setup.cpp b/src/p_setup.cpp
index f22979eac..fb6b34b53 100644
--- a/src/p_setup.cpp
+++ b/src/p_setup.cpp
@@ -1833,6 +1833,11 @@ void P_LoadThings2 (MapData * map)
 		mti[i].SkillFilter = MakeSkill(mti[i].flags);
 		mti[i].ClassFilter = (mti[i].flags & MTF_CLASS_MASK) >> MTF_CLASS_SHIFT;
 		mti[i].flags &= ~(MTF_SKILLMASK|MTF_CLASS_MASK);
+		if (level.flags2 & LEVEL2_HEXENHACK)
+		{
+			mti[i].flags &= 0x7ff;	// mask out Strife flags if playing an original Hexen map.
+		}
+
 		mti[i].gravity = FRACUNIT;
 		mti[i].RenderStyle = STYLE_Count;
 		mti[i].alpha = -1;