- 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)
This commit is contained in:
Randy Heit 2008-06-10 01:27:24 +00:00
parent e203ccda20
commit 2ca601eed1
3 changed files with 18 additions and 3 deletions

View file

@ -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 June 7, 2008
- Added self-modifying code notifications for Valgrind. - Added self-modifying code notifications for Valgrind.
Build with make VALGRIND=1 to turn them on. Build with make VALGRIND=1 to turn them on.

View file

@ -972,7 +972,7 @@ void P_SpawnSpecials (void)
// killough 3/7/98: // killough 3/7/98:
// support for drawn heights coming from different sector // support for drawn heights coming from different sector
case Transfer_Heights: case Transfer_Heights:
sec = sides[*lines[i].sidenum].sector; sec = sides[lines[i].sidenum[0]].sector;
if (lines[i].args[1] & 2) if (lines[i].args[1] & 2)
{ {
sec->MoreFlags |= SECF_FAKEFLOORONLY; sec->MoreFlags |= SECF_FAKEFLOORONLY;
@ -985,7 +985,7 @@ void P_SpawnSpecials (void)
{ {
sec->MoreFlags |= SECF_UNDERWATER; sec->MoreFlags |= SECF_UNDERWATER;
} }
else if (forcewater) else if (forcewater && lines[i].sidenum[1] == NO_SIDE)
{ {
sec->MoreFlags |= SECF_FORCEDUNDERWATER; sec->MoreFlags |= SECF_FORCEDUNDERWATER;
} }

View file

@ -51,6 +51,13 @@ ACTOR MegasphereHealth : Health // for manipulation by Dehacked
+INVENTORY.ALWAYSPICKUP +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 ACTOR Megasphere : CustomInventory 83
{ {
Game Doom Game Doom
@ -65,7 +72,7 @@ ACTOR Megasphere : CustomInventory 83
MEGA ABCD 6 BRIGHT MEGA ABCD 6 BRIGHT
Loop Loop
Pickup: Pickup:
TNT1 A 0 A_GiveInventory("BlueArmor", 1) TNT1 A 0 A_GiveInventory("BlueArmorForMegasphere", 1)
TNT1 A 0 A_GiveInventory("MegasphereHealth", 1) TNT1 A 0 A_GiveInventory("MegasphereHealth", 1)
Stop Stop
} }