OrdinaryMagician/vkdoom_m
OrdinaryMagician/vkdoom_m
1
Fork 0
Code Activity

Removed more literal references to AInventory.

Browse source
This commit is contained in:
Christoph Oelckers 2018-12-04 17:00:48 +01:00
commit cd563cc4db
29 changed files with 80 additions and 93 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/p_acs.cpp
View file

@ -9329,7 +9329,7 @@ scriptwait:
case PCD_GETSIGILPIECES:
{
AInventory *sigil;
AActor *sigil;
if (activator == NULL || (sigil = activator->FindInventory(NAME_Sigil)) == NULL)
{
@ -9346,11 +9346,10 @@ scriptwait:
if (activator != NULL)
{
PClass *type = PClass::FindClass (FBehavior::StaticLookupString (STACK(1)));
AInventory *item;
if (type != NULL && type->ParentClass == PClass::FindActor(NAME_Ammo))
{
item = activator->FindInventory (static_cast<PClassActor *>(type));
auto item = activator->FindInventory (static_cast<PClassActor *>(type));
if (item != NULL)
{
STACK(1) = item->IntVar(NAME_MaxAmount);
@ -9375,11 +9374,10 @@ scriptwait:
if (activator != NULL)
{
PClassActor *type = PClass::FindActor (FBehavior::StaticLookupString (STACK(2)));
AInventory *item;
if (type != NULL && type->ParentClass == PClass::FindActor(NAME_Ammo))
{
item = activator->FindInventory (type);
auto item = activator->FindInventory (type);
if (item != NULL)
{
item->IntVar(NAME_MaxAmount) = STACK(1);