OrdinaryMagician/vkdoom_m
OrdinaryMagician/vkdoom_m
1
Fork 0
Code Activity

- scriptified a_strifeitems.cpp and a_debris.cpp.

Browse source 
- Changed the glass shards so that they do not have to override FloorBounceMissile. It was the only place where this was virtually overridden and provided little usefulness.
- made 'out' variables work.
- fixed virtual call handling for HandlePickup.
This commit is contained in:
Christoph Oelckers 2016-11-29 12:17:05 +01:00
commit 3af9232fca
29 changed files with 374 additions and 528 deletions
Download patch file Download diff file Expand all files Collapse all files

27
src/p_mobj.cpp
View file

@ -942,7 +942,7 @@ AInventory *AActor::FirstInv ()
//
//============================================================================
bool AActor::DoUseInventory (AInventory *item)
bool AActor::UseInventory (AInventory *item)
{
// No using items if you're dead.
if (health <= 0)
@ -973,23 +973,7 @@ DEFINE_ACTION_FUNCTION(AActor, UseInventory)
{
PARAM_SELF_PROLOGUE(AActor);
PARAM_OBJECT(item, AInventory);
ACTION_RETURN_BOOL(self->DoUseInventory(item));
}
bool AActor::UseInventory(AInventory *item)
{
IFVIRTUAL(AActor, UseInventory)
{
// Without the type cast this picks the 'void *' assignment...
VMValue params[2] = { (DObject*)this, (DObject*)item };
VMReturn ret;
VMFrameStack stack;
int retval;
ret.IntAt(&retval);
stack.Call(func, params, 2, &ret, 1, nullptr);
return !!retval;
}
else return DoUseInventory(item);
ACTION_RETURN_BOOL(self->UseInventory(item));
}
//===========================================================================
@ -1304,6 +1288,13 @@ bool AActor::CheckLocalView (int playernum) const
return false;
}
DEFINE_ACTION_FUNCTION(AActor, CheckLocalView)
{
PARAM_SELF_PROLOGUE(AActor);
PARAM_INT(cp);
ACTION_RETURN_BOOL(self->CheckLocalView(cp));
}
//============================================================================
//
// AActor :: IsInsideVisibleAngles