From 9f3d7b14d3433977ccdf578b3e331de2a55729bd Mon Sep 17 00:00:00 2001 From: havoc Date: Sun, 29 Jun 2008 21:27:56 +0000 Subject: [PATCH] fix an error and a warning with my last commit git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@8382 d7cf8633-e32d-0410-b094-e92efae38249 --- model_alias.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/model_alias.c b/model_alias.c index e84d1873..8cf13d0c 100644 --- a/model_alias.c +++ b/model_alias.c @@ -2142,7 +2142,7 @@ void Mod_DARKPLACESMODEL_Load(dp_model_t *mod, void *buffer, void *bufferend) #define PSKQUATNEGATIONS void Mod_PSKMODEL_Load(dp_model_t *mod, void *buffer, void *bufferend) { - int i, j, index, version, recordsize, numrecords, meshvertices, meshtriangles; + int i, j, index, version, recordsize, numrecords, meshvertices, meshtriangles, size; int numpnts, numvtxw, numfaces, nummatts, numbones, numrawweights, numanimbones, numanims, numanimkeys; fs_offset_t filesize; pskpnts_t *pnts; @@ -2573,7 +2573,7 @@ void Mod_PSKMODEL_Load(dp_model_t *mod, void *buffer, void *bufferend) loadmodel->surfmesh.data_element3s[i] = loadmodel->surfmesh.data_element3i[i]; } if (data != (unsigned char *)loadmodel->data_surfaces + size) - Sys_Error("%s: combined alloc has wrong size! (%i bytes should be %i)\n", (int)size, (int)(data - (unsigned char *)loadmodel->data_surfaces)); + Sys_Error("%s: combined alloc has wrong size! (%i bytes should be %i)\n", loadmodel->name, (int)size, (int)(data - (unsigned char *)loadmodel->data_surfaces)); for (i = 0;i < loadmodel->numskins;i++) { -- 2.39.2