zdoom/gzdoom
0
0
Fork 0
mirror of https://github.com/ZDoom/gzdoom.git synced 2025-03-22 02:41:07 +00:00
Code Issues Projects Releases Packages Wiki Activity

Update p_actionfunctions.cpp

Browse source 
Woah, this didn't work with custom inventory chains!
This commit is contained in:
Shiny Metagross 2022-07-05 20:48:17 -07:00 committed by Christoph Oelckers
parent 69ee1eb0a2
commit fa6dfdf64c
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/playsim/p_actionfunctions.cpp
View file

@ -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 += '/';