OrdinaryMagician/vkdoom_m
OrdinaryMagician/vkdoom_m
1
Fork 0
Code Activity

The ReadyWeapon is now assumed to not be null

Browse source
This commit is contained in:
Leonard2 2016-05-30 15:09:03 +02:00
commit f14a840777
3 changed files with 39 additions and 38 deletions
Download patch file Download diff file Expand all files Collapse all files

10
src/p_user.cpp
View file

@ -3088,7 +3088,7 @@ void player_t::Serialize (FArchive &arc)
<< sx << sy
<< sprite << frame;
if (state != nullptr)
if (state != nullptr && ReadyWeapon != nullptr)
{
DPSprite *pspr;
pspr = GetPSprite(PSPLayers(layer));
@ -3108,14 +3108,6 @@ void player_t::Serialize (FArchive &arc)
pspr->x = sx;
pspr->y = sy;
}
pspr->Flags = 0;
if (layer < PSP_TARGETCENTER)
{
pspr->Flags |= PSPF_ADDBOB;
if (layer == PSP_FLASH)
pspr->Flags |= PSPF_ADDWEAPON;
}
}
if (layer == PSP_WEAPON)