ignore numBones assert if we're mixing jk2/jka models

JACoders · Feb 18, 2024 · e55cdc9 · e55cdc9
1 parent 540edeb
commit e55cdc9
Showing 1 changed file with 5 additions and 1 deletion.
diff --git 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 )