diff --git a/src/client/refresh/gl1/gl1_model.c b/src/client/refresh/gl1/gl1_model.c index 3912ee05..7f54d238 100644 --- a/src/client/refresh/gl1/gl1_model.c +++ b/src/client/refresh/gl1/gl1_model.c @@ -108,8 +108,8 @@ Mod_Modellist_f(void) continue; } - R_Printf(PRINT_ALL, "%8i : %s %s\n", - mod->extradatasize, mod->name, in_use); + R_Printf(PRINT_ALL, "%8i : %s %s r: %f #%d\n", + mod->extradatasize, mod->name, in_use, mod->radius, mod->numsubmodels); total += mod->extradatasize; } @@ -1008,7 +1008,7 @@ Mod_LoadBrushModel(model_t *mod, const void *buffer, int modfilelen) mod->numleafs, &mod->nodes, &mod->numnodes, mod_base, &header->lumps[LUMP_NODES]); } - Mod_LoadSubmodels (mod, mod_base, &header->lumps[LUMP_MODELS]); + Mod_LoadSubmodels(mod, mod_base, &header->lumps[LUMP_MODELS]); mod->numframes = 2; /* regular and alternate animation */ } @@ -1139,6 +1139,7 @@ Mod_ForName(const char *name, model_t *parent_model, qboolean crash) break; } + mod->radius = Mod_RadiusFromBounds(mod->mins, mod->maxs); mod->extradatasize = Hunk_End(); ri.FS_FreeFile(buf); diff --git a/src/client/refresh/gl3/gl3_model.c b/src/client/refresh/gl3/gl3_model.c index bb1dbcbd..e80fd265 100644 --- a/src/client/refresh/gl3/gl3_model.c +++ b/src/client/refresh/gl3/gl3_model.c @@ -105,8 +105,8 @@ GL3_Mod_Modellist_f(void) continue; } - R_Printf(PRINT_ALL, "%8i : %s %s\n", - mod->extradatasize, mod->name, in_use); + R_Printf(PRINT_ALL, "%8i : %s %s r: %f #%d\n", + mod->extradatasize, mod->name, in_use, mod->radius, mod->numsubmodels); total += mod->extradatasize; } @@ -933,7 +933,7 @@ Mod_LoadBrushModel(gl3model_t *mod, const void *buffer, int modfilelen) mod->numleafs, &mod->nodes, &mod->numnodes, mod_base, &header->lumps[LUMP_NODES]); } - Mod_LoadSubmodels (mod, mod_base, &header->lumps[LUMP_MODELS]); + Mod_LoadSubmodels(mod, mod_base, &header->lumps[LUMP_MODELS]); mod->numframes = 2; /* regular and alternate animation */ } @@ -1064,6 +1064,7 @@ Mod_ForName (const char *name, gl3model_t *parent_model, qboolean crash) break; } + mod->radius = Mod_RadiusFromBounds(mod->mins, mod->maxs); mod->extradatasize = Hunk_End(); ri.FS_FreeFile(buf); diff --git a/src/client/refresh/soft/sw_model.c b/src/client/refresh/soft/sw_model.c index 1b9ebbf5..8a716e34 100644 --- a/src/client/refresh/soft/sw_model.c +++ b/src/client/refresh/soft/sw_model.c @@ -108,8 +108,8 @@ Mod_Modellist_f(void) continue; } - R_Printf(PRINT_ALL, "%8i : %s %s\n", - mod->extradatasize, mod->name, in_use); + R_Printf(PRINT_ALL, "%8i : %s %s r: %f #%d\n", + mod->extradatasize, mod->name, in_use, mod->radius, mod->numsubmodels); total += mod->extradatasize; } @@ -799,7 +799,7 @@ Mod_LoadBrushModel(model_t *mod, const void *buffer, int modfilelen) mod->numleafs, &mod->nodes, &mod->numnodes, mod_base, &header->lumps[LUMP_NODES]); } - Mod_LoadSubmodels (mod, mod_base, &header->lumps[LUMP_MODELS]); + Mod_LoadSubmodels(mod, mod_base, &header->lumps[LUMP_MODELS]); mod->numframes = 2; /* regular and alternate animation */ R_InitSkyBox(mod); @@ -932,6 +932,7 @@ Mod_ForName(const char *name, model_t *parent_model, qboolean crash) break; } + mod->radius = Mod_RadiusFromBounds(mod->mins, mod->maxs); mod->extradatasize = Hunk_End(); ri.FS_FreeFile(buf); diff --git a/src/client/refresh/vk/vk_model.c b/src/client/refresh/vk/vk_model.c index ab8d5bac..3ae7e3ba 100644 --- a/src/client/refresh/vk/vk_model.c +++ b/src/client/refresh/vk/vk_model.c @@ -97,7 +97,7 @@ Mod_Init(void) } static void -Mod_LoadSubmodels (model_t *loadmodel, const byte *mod_base, const lump_t *l) +Mod_LoadSubmodels(model_t *loadmodel, const byte *mod_base, const lump_t *l) { dmodel_t *in; model_t *out; @@ -991,7 +991,7 @@ Mod_LoadBrushModel(model_t *mod, const void *buffer, int modfilelen) mod->numleafs, &mod->nodes, &mod->numnodes, mod_base, &header->lumps[LUMP_NODES]); } - Mod_LoadSubmodels (mod, mod_base, &header->lumps[LUMP_MODELS]); + Mod_LoadSubmodels(mod, mod_base, &header->lumps[LUMP_MODELS]); mod->numframes = 2; /* regular and alternate animation */ } @@ -1134,6 +1134,7 @@ Mod_ForName (const char *name, model_t *parent_model, qboolean crash) break; } + mod->radius = Mod_RadiusFromBounds(mod->mins, mod->maxs); if (mod->extradata) { mod->extradatasize = Hunk_End (); @@ -1308,8 +1309,8 @@ Mod_Modellist_f (void) if (!mod->name[0]) continue; - R_Printf(PRINT_ALL, "%8i : %s %s\n", - mod->extradatasize, mod->name, in_use); + R_Printf(PRINT_ALL, "%8i : %s %s r: %f #%d\n", + mod->extradatasize, mod->name, in_use, mod->radius, mod->numsubmodels); total += mod->extradatasize; } R_Printf(PRINT_ALL, "Total resident: %i in %d models\n", total, mod_loaded); diff --git a/src/server/sv_game.c b/src/server/sv_game.c index cb59e814..4e4ead4b 100644 --- a/src/server/sv_game.c +++ b/src/server/sv_game.c @@ -173,7 +173,7 @@ PF_setmodel(edict_t *ent, const char *name) if (!name) { - Com_Error(ERR_DROP, "PF_setmodel: NULL"); + Com_Error(ERR_DROP, "%s: NULL", __func__); } i = SV_ModelIndex(name);