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

6
src/g_inventory/a_pickups.cpp
View file

@ -132,9 +132,9 @@ DEFINE_ACTION_FUNCTION(AInventory, PrintPickupMessage)
//
//===========================================================================
void DepleteOrDestroy (AInventory *item)
void DepleteOrDestroy (AActor *item)
{
IFVIRTUALPTR(item, AInventory, DepleteOrDestroy)
IFVIRTUALPTRNAME(item, NAME_Inventory, DepleteOrDestroy)
{
VMValue params[1] = { item };
VMCall(func, params, 1, nullptr, 0);
@ -147,7 +147,7 @@ void DepleteOrDestroy (AInventory *item)
//
//===========================================================================
bool CallTryPickup(AInventory *item, AActor *toucher, AActor **toucher_return)
bool CallTryPickup(AActor *item, AActor *toucher, AActor **toucher_return)
{
static VMFunction *func = nullptr;
if (func == nullptr) PClass::FindFunction(&func, NAME_Inventory, NAME_CallTryPickup);