From: divverent Date: Sun, 19 Apr 2009 10:16:25 +0000 (+0000) Subject: fix error message about wrong light grid dimensions X-Git-Tag: xonotic-v0.1.0preview~1679 X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=c4841342fb9892fd7271e49ad6164065ef3facc5;p=xonotic%2Fdarkplaces.git fix error message about wrong light grid dimensions git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@8933 d7cf8633-e32d-0410-b094-e92efae38249 --- diff --git a/model_brush.c b/model_brush.c index f652f221..996bcda2 100644 --- a/model_brush.c +++ b/model_brush.c @@ -5311,7 +5311,7 @@ static void Mod_Q3BSP_LoadLightGrid(lump_t *l) if (l->filelen) { if (l->filelen < count * (int)sizeof(*in)) - Host_Error("Mod_Q3BSP_LoadLightGrid: invalid lightgrid lump size %i bytes, should be %i bytes (%ix%ix%i)", l->filelen, (int)(count * sizeof(*in)), loadmodel->brushq3.num_lightgrid_dimensions[0], loadmodel->brushq3.num_lightgrid_dimensions[1], loadmodel->brushq3.num_lightgrid_dimensions[2]); + Host_Error("Mod_Q3BSP_LoadLightGrid: invalid lightgrid lump size %i bytes, should be %i bytes (%ix%ix%i)", l->filelen, (int)(count * sizeof(*in)), loadmodel->brushq3.num_lightgrid_isize[0], loadmodel->brushq3.num_lightgrid_isize[1], loadmodel->brushq3.num_lightgrid_isize[2]); if (l->filelen != count * (int)sizeof(*in)) Con_Printf("Mod_Q3BSP_LoadLightGrid: Warning: calculated lightgrid size %i bytes does not match lump size %i\n", (int)(count * sizeof(*in)), l->filelen); out = (q3dlightgrid_t *)Mem_Alloc(loadmodel->mempool, count * sizeof(*out)); diff --git a/model_shared.h b/model_shared.h index 6935b862..cdcc846e 100644 --- a/model_shared.h +++ b/model_shared.h @@ -770,8 +770,6 @@ typedef struct model_brushq3_s int num_lightgrid_imins[3]; int num_lightgrid_imaxs[3]; int num_lightgrid_isize[3]; - // indexing/clamping - int num_lightgrid_dimensions[3]; // transform modelspace coordinates to lightgrid index matrix4x4_t num_lightgrid_indexfromworld;