From e55cdc921d678eb3ce1ecd87e2dd209940495e23 Mon Sep 17 00:00:00 2001 From: Razish Date: Sun, 18 Feb 2024 17:34:55 +1100 Subject: [PATCH] ignore numBones assert if we're mixing jk2/jka models --- code/rd-vanilla/tr_ghoul2.cpp | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/code/rd-vanilla/tr_ghoul2.cpp b/code/rd-vanilla/tr_ghoul2.cpp index b1f6d43a6b..1710799542 100644 --- a/code/rd-vanilla/tr_ghoul2.cpp +++ b/code/rd-vanilla/tr_ghoul2.cpp @@ -3611,7 +3611,11 @@ qboolean R_LoadMDXM( model_t *mod, void *buffer, const char *mod_name, qboolean #ifndef JK2_MODE else { - assert (tr.models[mdxm->animIndex]->mdxa->numBones == mdxm->numBones); + // let us mix JK2/JKA models and animations + if (tr.models[mdxm->animIndex]->mdxa->numBones != 53 && tr.models[mdxm->animIndex]->mdxa->numBones != 72 && mdxm->numBones != 53 && + mdxm->numBones != 72) { + assert(tr.models[mdxm->animIndex]->mdxa->numBones == mdxm->numBones); + } if (tr.models[mdxm->animIndex]->mdxa->numBones != mdxm->numBones) { if ( isAnOldModelFile )