Merge branch 'master' of https://github.com/ZDoom/gzdoom
This commit is contained in:
commit
a72057945b
24 changed files with 65 additions and 579 deletions
|
|
@ -1141,7 +1141,7 @@ FSpriteModelFrame * FindModelFrame(const AActor * thing, int sprite, int frame,
|
|||
|
||||
if(thing->flags9 & MF9_DECOUPLEDANIMATIONS)
|
||||
{
|
||||
return &BaseSpriteModelFrames[(thing->modelData != nullptr && thing->modelData->modelDef != nullptr) ? thing->modelData->modelDef : thing->GetClass()];
|
||||
return BaseSpriteModelFrames.CheckKey((thing->modelData != nullptr && thing->modelData->modelDef != nullptr) ? thing->modelData->modelDef : thing->GetClass());
|
||||
}
|
||||
else
|
||||
{
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue