From fa6dfdf64c60b8984c18185af0a21bbef453080b Mon Sep 17 00:00:00 2001 From: Shiny Metagross <30511800+ShinyMetagross@users.noreply.github.com> Date: Tue, 5 Jul 2022 20:48:17 -0700 Subject: [PATCH] Update p_actionfunctions.cpp Woah, this didn't work with custom inventory chains! --- src/playsim/p_actionfunctions.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/playsim/p_actionfunctions.cpp b/src/playsim/p_actionfunctions.cpp index 6e5fb28aaf..2f7743ea27 100644 --- a/src/playsim/p_actionfunctions.cpp +++ b/src/playsim/p_actionfunctions.cpp @@ -5050,7 +5050,7 @@ DEFINE_ACTION_FUNCTION(AActor, A_ChangeModel) if (self == nullptr) ACTION_RETURN_BOOL(false); - AActor* mobj = ACTION_CALL_FROM_PSPRITE() && (flags & CMDL_WEAPONTOPLAYER) ? self : stateowner; + AActor* mobj = (ACTION_CALL_FROM_PSPRITE() && (flags & CMDL_WEAPONTOPLAYER)) || ACTION_CALL_FROM_INVENTORY() ? self : stateowner; if (modelpath[(int)modelpath.Len() - 1] != '/') modelpath += '/'; if (skinpath[(int)skinpath.Len() - 1] != '/') skinpath += '/';