zdoom/gzdoom
0
0
Fork 0
mirror of https://github.com/ZDoom/gzdoom.git synced 2025-06-04 19:10:59 +00:00
Code Issues Projects Releases Packages Wiki Activity

Generalized the psprites implementation

Browse source
This commit is contained in:
Leonard2 2016-05-09 20:03:47 +02:00
parent bd396ccb7c
commit 1966b61b8f
25 changed files with 743 additions and 477 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/p_mobj.cpp
View file

@ -997,12 +997,12 @@ 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;
player->GetPSprite(ps_weapon)->SetState(nullptr);
player->GetPSprite(ps_flash)->SetState(nullptr);
}
}