Undo snax's order of operation breakage, and fix the typo that broke lightmap merging for r_lightmap_components 1.

The real problem with greyscale lighting, is in brush model loading. It'll probably take me a while to sort it out, since taniwha didn't get to it before taking off for the weekend. Sorry...
This commit is contained in:
Ragnvald Maartmann-Moe IV 2002-05-25 15:01:23 +00:00
parent a116529db1
commit b7900a2c43

View file

@ -295,7 +295,7 @@ R_BuildLightMap (msurface_t *surf, byte * dest, int stride)
bl++;
*dest++ = min (*bl >> shift, 255);
bl++;
(*dest)++; // set to 255 if RGBA internal format is wanted
*dest++; // set to 255 if RGBA internal format is wanted
// instead of RGB
}
}
@ -316,7 +316,7 @@ R_BuildLightMap (msurface_t *surf, byte * dest, int stride)
for (i = 0; i < tmax; i++, dest += stride) {
for (j = 0; j < smax; j++) {
*dest++ = min (*bl >> shift, 255);
(*bl)++;
bl++;
}
}
break;