make color averaging use 64bit integers, instead of 32bit ones, as they wrap on 512x5...

[xonotic/darkplaces.git] / gl_rmain.c

diff --git a/gl_rmain.c b/gl_rmain.c
index 9ce70aa25c06c8021c4a7e8533cf6088c55587e8..e917112453b58543fdefc6dc9bbaf47ba09030b5 100644 (file)
--- a/gl_rmain.c
+++ b/gl_rmain.c
@@ -1907,7 +1907,7 @@ skinframe_t *R_SkinFrame_Find(const char *name, int textureflags, int comparewid
 
 #define R_SKINFRAME_LOAD_AVERAGE_COLORS(cnt, getpixel) \
        { \
-               unsigned long avgcolor[5], wsum; \
+               unsigned long long avgcolor[5], wsum; \
                int pix, comp, w; \
                avgcolor[0] = 0; \
                avgcolor[1] = 0; \
@@ -2016,6 +2016,7 @@ skinframe_t *R_SkinFrame_LoadExternal_CheckAlpha(const char *name, int texturefl
        }
 
        R_SKINFRAME_LOAD_AVERAGE_COLORS(basepixels_width * basepixels_height, basepixels[4 * pix + comp]);
+       //Con_Printf("Texture %s has average colors %f %f %f alpha %f\n", name, skinframe->avgcolor[0], skinframe->avgcolor[1], skinframe->avgcolor[2], skinframe->avgcolor[3]);
 
        // _norm is the name used by tenebrae and has been adopted as standard
        if (loadnormalmap)