OrdinaryMagician/vkdoom_m
OrdinaryMagician/vkdoom_m
1
Fork 0
Code Activity

Merge branch 'PSprites'

Browse source
This commit is contained in:
Christoph Oelckers 2016-06-16 16:16:16 +02:00
commit 7ccdbf9b62
28 changed files with 1018 additions and 518 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/p_mobj.cpp
View file

@ -997,12 +997,10 @@ void AActor::ClearInventory()
invp = &inv->Inventory;
}
}
if (player != NULL)
if (player != nullptr)
{
player->ReadyWeapon = NULL;
player->ReadyWeapon = nullptr;
player->PendingWeapon = WP_NOCHANGE;
player->psprites[ps_weapon].state = NULL;
player->psprites[ps_flash].state = NULL;
}
}