zdoom/qzdoom-gpl
0
0
Fork 0
mirror of https://github.com/ZDoom/qzdoom-gpl.git synced 2025-02-21 19:00:56 +00:00
Code Issues Projects Releases Packages Wiki Activity

- Fixed: Destroying a weapon that claimed it was its own sister would crash.

Browse source 
SVN r3441 (trunk)
This commit is contained in:
Randy Heit 2012-03-15 23:18:13 +00:00
parent f500947814
commit 5f23b4f64a
1 changed files with 8 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
src/g_shared/a_weapons.cpp
View file

@ -146,11 +146,16 @@ bool AWeapon::Use (bool pickup)
void AWeapon::Destroy() void AWeapon::Destroy()
{ {
if (SisterWeapon != NULL) AWeapon *sister = SisterWeapon;
if (sister != NULL)
{ {
// avoid recursion // avoid recursion
SisterWeapon->SisterWeapon = NULL; sister->SisterWeapon = NULL;
SisterWeapon->Destroy(); if (sister != this)
{ // In case we are our own sister, don't crash.
sister->Destroy();
}
} }
Super::Destroy(); Super::Destroy();
} }