zdoom/gzdoom
0
0
Fork 0
mirror of https://github.com/ZDoom/gzdoom.git synced 2024-11-29 15:22:08 +00:00
Code Issues Projects Releases Packages Wiki Activity

Look up named frames using the Animation ID (if any).

Browse source
This commit is contained in:
Marisa the Magician 2022-11-30 14:22:22 +01:00 committed by Christoph Oelckers
parent 91d3c4b606
commit 9ad7b8a048
1 changed files with 4 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/r_data/models.cpp
View file

@ -820,6 +820,10 @@ static void ParseModelDefLump(int Lump)
if (smf.modelIDs[index] != -1) if (smf.modelIDs[index] != -1)
{ {
FModel *model = Models[smf.modelIDs[index]]; FModel *model = Models[smf.modelIDs[index]];
if (smf.animationIDs[index] != -1)
{
model = Models[smf.animationIDs[index]];
}
smf.modelframes[index] = model->FindFrame(sc.String); smf.modelframes[index] = model->FindFrame(sc.String);
if (smf.modelframes[index]==-1) sc.ScriptError("Unknown frame '%s' in %s", sc.String, type->TypeName.GetChars()); if (smf.modelframes[index]==-1) sc.ScriptError("Unknown frame '%s' in %s", sc.String, type->TypeName.GetChars());
} }