From 07e74419d5fc6f375a6b89ea0c92300675cb5b73 Mon Sep 17 00:00:00 2001
From: Christoph Oelckers <coelckers@zdoom.fake>
Date: Sat, 27 Sep 2008 07:57:41 +0000
Subject: [PATCH] - Fixed: weapon.ammogive2 always gave 2 amounts of ammo.

SVN r1249 (trunk)
---
 docs/rh-log.txt                      | 1 +
 src/thingdef/thingdef_properties.cpp | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/docs/rh-log.txt b/docs/rh-log.txt
index c7f309396..c6914a705 100644
--- a/docs/rh-log.txt
+++ b/docs/rh-log.txt
@@ -1,4 +1,5 @@
 September 27, 2008  (Changes by Graf Zahl)
+- Fixed: weapon.ammogive2 always gave 2 amounts of ammo.
 - Fixed: The translation string parser printed a broken error message.
 
 September 24, 2008  (Changes by Graf Zahl)
diff --git a/src/thingdef/thingdef_properties.cpp b/src/thingdef/thingdef_properties.cpp
index d18dd7536..ace5c856a 100644
--- a/src/thingdef/thingdef_properties.cpp
+++ b/src/thingdef/thingdef_properties.cpp
@@ -1526,7 +1526,7 @@ DEFINE_CLASS_PROPERTY(ammogive1, I, Weapon)
 DEFINE_CLASS_PROPERTY(ammogive2, I, Weapon)
 {
 	PROP_INT_PARM(i, 0);
-	defaults->AmmoGive2 = 2;
+	defaults->AmmoGive2 = i;
 }
 
 //==========================================================================