From fe8a0d66a1aae06b05e4c69891e220a9754373d7 Mon Sep 17 00:00:00 2001 From: divverent Date: Sun, 6 Dec 2009 18:48:16 +0000 Subject: [PATCH] parse gridsize like q3map2 does (less strict) git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@9546 d7cf8633-e32d-0410-b094-e92efae38249 --- model_brush.c | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/model_brush.c b/model_brush.c index 60dd1bab..c7df1a20 100644 --- a/model_brush.c +++ b/model_brush.c @@ -4189,13 +4189,21 @@ static void Mod_Q3BSP_LoadEntities(lump_t *l) if (!COM_ParseToken_Simple(&data, false, false)) break; // error strlcpy(value, com_token, sizeof(value)); - if (!strcmp("gridsize", key)) + if (!strcasecmp("gridsize", key)) // this one is case insensitive to 100% match q3map2 { #if _MSC_VER >= 1400 #define sscanf sscanf_s #endif +#if 0 if (sscanf(value, "%f %f %f", &v[0], &v[1], &v[2]) == 3 && v[0] != 0 && v[1] != 0 && v[2] != 0) VectorCopy(v, loadmodel->brushq3.num_lightgrid_cellsize); +#else + VectorSet(v, 64, 64, 128); + if(sscanf(value, "%f %f %f", &v[0], &v[1], &v[2]) != 3) + Con_Printf("Mod_Q3BSP_LoadEntities: funny gridsize \"%s\" in %s, interpreting as \"%f %f %f\" to match q3map2's parsing\n", value, loadmodel->name, v[0], v[1], v[2]); + if (v[0] != 0 && v[1] != 0 && v[2] != 0) + VectorCopy(v, loadmodel->brushq3.num_lightgrid_cellsize); +#endif } else if (!strcmp("deluxeMaps", key)) { -- 2.39.2