From 2ca601eed1d1704eef2c1571460baa6cbf81d581 Mon Sep 17 00:00:00 2001
From: Randy Heit <rheit@zdoom.fake>
Date: Tue, 10 Jun 2008 01:27:24 +0000
Subject: [PATCH] - Dehacked fix discovered by entryway: Dehacked only changes
 the blue armor's   armortype. It does not touch the armor given by the
 megasphere. - Changed forcewater handling so that only control sectors
 created by one-   sided lines become swimmable, since there's a good chance
 that a two-sided   line is creating the control sector out of a normal,
 accessible portion of   the map. (See e.g. linedef 29242 of zdoomcmp1.)

SVN r1026 (trunk)
---
 docs/rh-log.txt                        | 8 ++++++++
 src/p_spec.cpp                         | 4 ++--
 wadsrc/decorate/doom/doomartifacts.txt | 9 ++++++++-
 3 files changed, 18 insertions(+), 3 deletions(-)

diff --git a/docs/rh-log.txt b/docs/rh-log.txt
index 5fc4ef856..46fd944dd 100644
--- a/docs/rh-log.txt
+++ b/docs/rh-log.txt
@@ -1,3 +1,11 @@
+June 9, 2008
+- Dehacked fix discovered by entryway: Dehacked only changes the blue armor's
+  armortype. It does not touch the armor given by the megasphere.
+- Changed forcewater handling so that only control sectors created by one-
+  sided lines become swimmable, since there's a good chance that a two-sided
+  line is creating the control sector out of a normal, accessible portion of
+  the map. (See e.g. linedef 29242 of zdoomcmp1.)
+
 June 7, 2008
 - Added self-modifying code notifications for Valgrind.
   Build with make VALGRIND=1 to turn them on.
diff --git a/src/p_spec.cpp b/src/p_spec.cpp
index 5b98cdf3b..e4384a86b 100644
--- a/src/p_spec.cpp
+++ b/src/p_spec.cpp
@@ -972,7 +972,7 @@ void P_SpawnSpecials (void)
 		// killough 3/7/98:
 		// support for drawn heights coming from different sector
 		case Transfer_Heights:
-			sec = sides[*lines[i].sidenum].sector;
+			sec = sides[lines[i].sidenum[0]].sector;
 			if (lines[i].args[1] & 2)
 			{
 				sec->MoreFlags |= SECF_FAKEFLOORONLY;
@@ -985,7 +985,7 @@ void P_SpawnSpecials (void)
 			{
 				sec->MoreFlags |= SECF_UNDERWATER;
 			}
-			else if (forcewater)
+			else if (forcewater && lines[i].sidenum[1] == NO_SIDE)
 			{
 				sec->MoreFlags |= SECF_FORCEDUNDERWATER;
 			}
diff --git a/wadsrc/decorate/doom/doomartifacts.txt b/wadsrc/decorate/doom/doomartifacts.txt
index d18e3149c..fb822f30f 100644
--- a/wadsrc/decorate/doom/doomartifacts.txt
+++ b/wadsrc/decorate/doom/doomartifacts.txt
@@ -51,6 +51,13 @@ ACTOR MegasphereHealth : Health	// for manipulation by Dehacked
 	+INVENTORY.ALWAYSPICKUP
 }
 
+// DeHackEd can only modify the blue armor's type, not the megasphere's.
+actor BlueArmorForMegasphere : BlueArmor
+{
+	Armor.SavePercent 50
+	Armor.SaveAmount 200
+}
+
 ACTOR Megasphere : CustomInventory 83
 {
 	Game Doom
@@ -65,7 +72,7 @@ ACTOR Megasphere : CustomInventory 83
 		MEGA ABCD 6 BRIGHT
 		Loop
 	Pickup:
-		TNT1 A 0 A_GiveInventory("BlueArmor", 1)
+		TNT1 A 0 A_GiveInventory("BlueArmorForMegasphere", 1)
 		TNT1 A 0 A_GiveInventory("MegasphereHealth", 1)
 		Stop
 	}