- Fixed: AActor::CopyFriendliness must not copy the target if it has the

MF3_NOTARGET flag set.
- Fixed: Picking up weapons in deathmatch gives 2.5 times as much ammo as
  in other modes.


SVN r547 (trunk)

src/g_shared/a_weapons.cpp

@@ -248,6 +248,12 @@ AAmmo *AWeapon::AddAmmo (AActor *other, const PClass *ammotype, int amount)
 	{
 		return NULL;
 	}
+
+	// [BC] This behavior is from the original Doom. Give 5/2 times as much ammo when
+	// we pick up a weapon in deathmatch.
+	if (( deathmatch ) && ( gameinfo.gametype == GAME_Doom ))
+		amount = amount * 5 / 2;
+
 	// extra ammo in baby mode and nightmare mode
 	if (!(this->ItemFlags&IF_IGNORESKILL))
 	{