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

18
src/p_pspr.cpp
View file

@ -1031,6 +1031,11 @@ DEFINE_ACTION_FUNCTION(AInventory, A_Lower)
{
return 0;
}
if (nullptr == player->ReadyWeapon)
{
P_BringUpWeapon(player);
return 0;
}
psp = player->GetPSprite(PSP_WEAPON);
if (player->morphTics || player->cheats & CF_INSTANTWEAPSWITCH)
{
@ -1084,6 +1089,10 @@ DEFINE_ACTION_FUNCTION(AInventory, A_Raise)
P_DropWeapon(player);
return 0;
}
if (player->ReadyWeapon == nullptr)
{
return 0;
}
psp = player->GetPSprite(PSP_WEAPON);
psp->y -= RAISESPEED;
if (psp->y > WEAPONTOP)
@ -1091,14 +1100,7 @@ DEFINE_ACTION_FUNCTION(AInventory, A_Raise)
return 0;
}
psp->y = WEAPONTOP;
if (player->ReadyWeapon != nullptr)
{
psp->SetState(player->ReadyWeapon->GetReadyState());
}
else
{
psp->SetState(nullptr);
}
psp->SetState(player->ReadyWeapon->GetReadyState());
return 0;
}