OrdinaryMagician/vkdoom_m
OrdinaryMagician/vkdoom_m
1
Fork 0
Code Activity

Make sure never to call GetPSprite when the ReadyWeapon is null

Browse source
This commit is contained in:
Leonard2 2016-06-01 23:00:04 +02:00
commit 8244d2c844
5 changed files with 28 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

20
src/p_user.cpp
View file

@ -1376,14 +1376,16 @@ void APlayerPawn::MorphPlayerThink ()
void APlayerPawn::ActivateMorphWeapon ()
{
PClassActor *morphweapon = PClass::FindActor (MorphWeapon);
DPSprite *pspr = player->GetPSprite(PSP_WEAPON);
player->PendingWeapon = WP_NOCHANGE;
pspr->y = WEAPONTOP;
if (player->ReadyWeapon != nullptr)
{
player->GetPSprite(PSP_WEAPON)->y = WEAPONTOP;
}
if (morphweapon == nullptr || !morphweapon->IsDescendantOf (RUNTIME_CLASS(AWeapon)))
{ // No weapon at all while morphed!
player->ReadyWeapon = nullptr;
pspr->SetState(nullptr);
}
else
{
@ -1398,14 +1400,14 @@ void APlayerPawn::ActivateMorphWeapon ()
}
if (player->ReadyWeapon != nullptr)
{
pspr->SetState(player->ReadyWeapon->GetReadyState());
}
else
{
pspr->SetState(nullptr);
player->GetPSprite(PSP_WEAPON)->SetState(player->ReadyWeapon->GetReadyState());
}
}
player->GetPSprite(PSP_FLASH)->SetState(nullptr);
if (player->ReadyWeapon != nullptr)
{
player->GetPSprite(PSP_FLASH)->SetState(nullptr);
}
player->PendingWeapon = WP_NOCHANGE;
}