* Updated to ZDoom r3442:

- Added clearlinespecial, for doom.wad e3m4 line 1069.
- Allow using the parameterized compatibility options with IWAD maps.
- Fixed: Destroying a weapon that claimed it was its own sister would crash.
- Apply fix from previous commit to Doom-format maps. (Previous commit only did it for Hexen.)
- Fixed: In non-UDMF maps, projectile impact activation implies projectile cross activation as well.
- Applied a modified version of FDARI's patch to prevent giving health to dead things:
  * P_GiveBody() now takes a max parameter so that it can also do the bulk of the work AHealth::TryPickup() previously did.
  * Setting an actor's health to 0 or below with SetActorProperty will now kill the actor properly.- Added setactivation command for compatibility.cpp to fix the gear boxes on hexdd.wad, map54, which should be set for player uses activation but are not.
- Added some developer mode messages for setlinespecial and clearlinespecial.
- Fixed: Old-style ACS has the string table record offsets from the start of the object file to the strings, not from the start of the string table, so UnescapeStringTable() needs to be told where the offsets are based.

git-svn-id: http://mancubus.net/svn/hosted/gzdoom/trunk@1313 b0f79afe-0144-0410-b225-9a4edf0717df

src/p_setup.cpp

@@ -2179,7 +2179,14 @@ void P_LoadLineDefs2 (MapData * map)
 
 		// convert the activation type
 		ld->activation = 1 << GET_SPAC(ld->flags);
-		if (ld->activation == SPAC_AnyCross) ld->activation = SPAC_Impact|SPAC_PCross;	// this is really PTouch
+		if (ld->activation == SPAC_AnyCross)
+		{ // this is really PTouch
+			ld->activation = SPAC_Impact | SPAC_PCross;
+		}
+		else if (ld->activation == SPAC_Impact)
+		{ // In non-UMDF maps, Impact implies PCross
+			ld->activation = SPAC_Impact | SPAC_PCross;
+		}
 		ld->flags &= ~ML_SPAC_MASK;
 	}
 	delete[] mldf;