- last commit was incomplete. Forgot to save 2 files.

SVN r1067 (trunk)
This commit is contained in:
Christoph Oelckers 2008-07-05 10:31:36 +00:00
parent d2f1515aa6
commit ac4fb23c35
2 changed files with 2 additions and 1 deletions

View file

@ -236,6 +236,7 @@ public:
virtual bool TryPickup (AActor *toucher); virtual bool TryPickup (AActor *toucher);
virtual bool PickupForAmmo (AWeapon *ownedWeapon); virtual bool PickupForAmmo (AWeapon *ownedWeapon);
virtual bool Use (bool pickup); virtual bool Use (bool pickup);
virtual void Destroy();
virtual FState *GetUpState (); virtual FState *GetUpState ();
virtual FState *GetDownState (); virtual FState *GetDownState ();

View file

@ -113,7 +113,7 @@ bool AWeapon::Use (bool pickup)
// //
//=========================================================================== //===========================================================================
FState *AWeapon::Destroy() void AWeapon::Destroy()
{ {
if (SisterWeapon != NULL) if (SisterWeapon != NULL)
{ {