From 23a7fd40aa0230827b8ee4ac4790ea83ecd6fd08 Mon Sep 17 00:00:00 2001 From: Christoph Oelckers Date: Fri, 20 Jan 2017 20:04:57 +0100 Subject: [PATCH] - fixed: The script wrapper for AActor::TakeInventory erroneously called RemoveInventory, not TakeInventory. --- src/p_mobj.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/p_mobj.cpp b/src/p_mobj.cpp index c3bbcf076..0cdd197a8 100644 --- a/src/p_mobj.cpp +++ b/src/p_mobj.cpp @@ -920,11 +920,11 @@ bool AActor::TakeInventory(PClassActor *itemclass, int amount, bool fromdecorate DEFINE_ACTION_FUNCTION(AActor, TakeInventory) { PARAM_SELF_PROLOGUE(AActor); - PARAM_OBJECT_NOT_NULL(item, AInventory); + PARAM_CLASS_NOT_NULL(item, AInventory); PARAM_INT(amount); PARAM_BOOL_DEF(fromdecorate); PARAM_BOOL_DEF(notakeinfinite); - self->RemoveInventory(item); + self->TakeInventory(item, amount, fromdecorate, notakeinfinite); return 0; }