OrdinaryMagician/vkdoom_m
OrdinaryMagician/vkdoom_m
1
Fork 0
Code Activity

- completed Heretic scriptification with the two remaining artifacts.

Browse source
This commit is contained in:
Christoph Oelckers 2016-11-25 18:41:00 +01:00
commit 0d6f37835f
11 changed files with 77 additions and 104 deletions
Download patch file Download diff file Expand all files Collapse all files

27
src/g_shared/a_pickups.cpp
View file

@ -20,6 +20,7 @@
#include "d_player.h"
#include "p_spec.h"
#include "serializer.h"
#include "virtual.h"
static FRandom pr_restore ("RestorePos");
@ -1005,6 +1006,30 @@ bool AInventory::Use (bool pickup)
return false;
}
DEFINE_ACTION_FUNCTION(AInventory, Use)
{
PARAM_SELF_PROLOGUE(AInventory);
PARAM_BOOL(pickup);
ACTION_RETURN_BOOL(self->Use(pickup));
}
bool AInventory::CallUse(bool pickup)
{
IFVIRTUAL(AInventory, Use)
{
VMValue params[2] = { (DObject*)this, pickup };
VMReturn ret;
VMFrameStack stack;
int retval;
ret.IntAt(&retval);
stack.Call(func, params, 2, &ret, 1, nullptr);
return !!retval;
}
else return Use(pickup);
}
//===========================================================================
//
// AInventory :: Hide
@ -1494,7 +1519,7 @@ bool AInventory::TryPickup (AActor *&toucher)
copy->AttachToOwner (newtoucher);
if (ItemFlags & IF_AUTOACTIVATE)
{
if (copy->Use (true))
if (copy->CallUse (true))
{
if (--copy->Amount <= 0)
{