OrdinaryMagician/vkdoom_m
OrdinaryMagician/vkdoom_m
1
Fork 0
Code Activity

- removed all direct references of AInventory::Owner and AInventory::Amount from the C++ code.

Browse source
This commit is contained in:
Christoph Oelckers 2018-12-03 00:43:01 +01:00
commit 0e095b0c05
15 changed files with 124 additions and 157 deletions
Download patch file Download diff file Expand all files Collapse all files

25
src/fragglescript/t_func.cpp
View file

@ -2409,28 +2409,11 @@ void FParser::SF_IsPlayerObj(void)
//
// CheckInventory
//
// Returns how much of a particular item an actor has.
// forward to the ACS equivalent.
//
//============================================================================
static int FS_CheckInventory (AActor *activator, const char *type)
{
if (activator == NULL)
return 0;
if (strcmp (type, "Armor") == 0)
{
type = "BasicArmor";
}
else if (strcmp (type, "Health") == 0)
{
return activator->health;
}
PClassActor *info = PClass::FindActor (type);
AInventory *item = activator->FindInventory (info);
return item ? item->Amount : 0;
}
int CheckInventory(AActor *activator, const char *type, bool max = false);
//==========================================================================
@ -2463,7 +2446,7 @@ void FParser::SF_PlayerKeys(void)
if(t_argc == 2)
{
t_return.type = svt_int;
t_return.value.i = FS_CheckInventory(players[playernum].mo, keyname);
t_return.value.i = CheckInventory(players[playernum].mo, keyname);
return;
}
else
@ -2707,7 +2690,7 @@ void FParser::SF_CheckInventory(void)
return;
}
t_return.type = svt_int;
t_return.value.i = FS_CheckInventory(players[playernum].mo, stringvalue(t_argv[1]));
t_return.value.i = CheckInventory(players[playernum].mo, stringvalue(t_argv[1]));
}
}