From c2da140cccb11881772435b685c1138412051634 Mon Sep 17 00:00:00 2001 From: Alibek Omarov Date: Wed, 22 Jan 2025 19:12:43 +0300 Subject: [PATCH] engine: model: do not crash if renderer refused to load this model --- engine/common/model.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/engine/common/model.c b/engine/common/model.c index bbd1a357..7ee1ecda 100644 --- a/engine/common/model.c +++ b/engine/common/model.c @@ -258,7 +258,7 @@ model_t *Mod_LoadModel( model_t *mod, qboolean crash ) { char tempname[MAX_QPATH]; fs_offset_t length = 0; - qboolean loaded; + qboolean loaded, loaded2 = false; byte *buf; model_info_t *p; @@ -328,12 +328,13 @@ model_t *Mod_LoadModel( model_t *mod, qboolean crash ) { // let the server.dll load custom data svgame.physFuncs.Mod_ProcessUserData( mod, true, buf ); + loaded2 = true; } } #if !XASH_DEDICATED else { - loaded = ref.dllFuncs.Mod_ProcessRenderData( mod, true, buf ); + loaded2 = ref.dllFuncs.Mod_ProcessRenderData( mod, true, buf ); } #endif } @@ -345,7 +346,7 @@ model_t *Mod_LoadModel( model_t *mod, qboolean crash ) hdr->pposeverts = NULL; } - if( !loaded ) + if( !loaded || !loaded2 ) { Mod_FreeModel( mod ); Mem_Free( buf );