From ac4fb23c35b448aa8ac22d23eb50445686bde0fb Mon Sep 17 00:00:00 2001
From: Christoph Oelckers <coelckers@zdoom.fake>
Date: Sat, 5 Jul 2008 10:31:36 +0000
Subject: [PATCH] - last commit was incomplete. Forgot to save 2 files.

SVN r1067 (trunk)
---
 src/g_shared/a_pickups.h   | 1 +
 src/g_shared/a_weapons.cpp | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/g_shared/a_pickups.h b/src/g_shared/a_pickups.h
index f9ccbe2a6..152821a28 100644
--- a/src/g_shared/a_pickups.h
+++ b/src/g_shared/a_pickups.h
@@ -236,6 +236,7 @@ public:
 	virtual bool TryPickup (AActor *toucher);
 	virtual bool PickupForAmmo (AWeapon *ownedWeapon);
 	virtual bool Use (bool pickup);
+	virtual void Destroy();
 
 	virtual FState *GetUpState ();
 	virtual FState *GetDownState ();
diff --git a/src/g_shared/a_weapons.cpp b/src/g_shared/a_weapons.cpp
index 842b3e50d..1303f3ec9 100644
--- a/src/g_shared/a_weapons.cpp
+++ b/src/g_shared/a_weapons.cpp
@@ -113,7 +113,7 @@ bool AWeapon::Use (bool pickup)
 //
 //===========================================================================
 
-FState *AWeapon::Destroy()
+void AWeapon::Destroy()
 {
 	if (SisterWeapon != NULL)
 	{