clean up lightmap merge power code

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@9137 d7cf8633-e32d-0410-b094-e92efae38249

diff --git a/model_brush.c b/model_brush.c
index f2657c0e0cd45be4b9659055f7d1728c7e82fb6c..f9def07322ba87fb5527bc9a49274adfdc89d415 100644 (file)
--- a/model_brush.c
+++ b/model_brush.c
@@ -4614,18 +4614,15 @@ static void Mod_Q3BSP_LoadLightmaps(lump_t *l, lump_t *faceslump)
        Con_DPrintf("%s is %sdeluxemapped\n", loadmodel->name, loadmodel->brushq3.deluxemapping ? "" : "not ");
 
        // figure out what the most reasonable merge power is within limits
+
        loadmodel->brushq3.num_lightmapmergepower = 0;
-       for (power = 1;power <= mod_q3bsp_lightmapmergepower.integer && (128 << power) <= gl_max_texture_size; power++)
-               loadmodel->brushq3.num_lightmapmergepower = power;
 
-       // as the lightmap size may actually be another power of 2, adjust for this
-       // (and interpret it as the power for 128x128 lightmaps above)
        for(i = 0; (128 << i) < size; ++i)
-               loadmodel->brushq3.num_lightmapmergepower -= 1;
-       while ((1 << (loadmodel->brushq3.num_lightmapmergepower * 2)) >= 4 * (count >> loadmodel->brushq3.deluxemapping))
-               loadmodel->brushq3.num_lightmapmergepower -= 1;
-       if(loadmodel->brushq3.num_lightmapmergepower < 0)
-               loadmodel->brushq3.num_lightmapmergepower = 0;
+               ;
+       // i is now 0 for 128, 1 for 256, etc
+
+       for (power = 1;power + i <= mod_q3bsp_lightmapmergepower.integer && (size << power) <= gl_max_texture_size && (1 << (power * 2)) < 4 * (count >> loadmodel->brushq3.deluxemapping); power++)
+               loadmodel->brushq3.num_lightmapmergepower = power;
 
        loadmodel->brushq3.num_lightmapmerge = 1 << loadmodel->brushq3.num_lightmapmergepower;