New grow and skid sounds from remaxim

[supertux.git] / src / video / sdl_texture.cpp

diff --git a/src/video/sdl_texture.cpp b/src/video/sdl_texture.cpp
index b5b6dc6..05bf5a2 100644 (file)
--- a/src/video/sdl_texture.cpp
+++ b/src/video/sdl_texture.cpp
@@ -483,7 +483,10 @@ namespace
             semitransparent++;
             squaredalphasum += alpha * alpha;
           }
-          colors[((red & 0xf0) << 4) | (green & 0xf0) | ((blue & 0xf0) >> 4)] = true;
+          if(alpha != 0)
+          {
+            colors[((red & 0xf0) << 4) | (green & 0xf0) | ((blue & 0xf0) >> 4)] = true;
+          }
         }
       }
       if(SDL_MUSTLOCK(src))
@@ -608,9 +611,11 @@ namespace SDL
     texture = optimize(image);
     //width = texture->w;
     //height = texture->h;
-    int numerator, denominator;
-    float xfactor = (float) config->screenwidth / SCREEN_WIDTH;
-    float yfactor = (float) config->screenheight / SCREEN_HEIGHT;
+    int numerator   = 1;
+    int denominator = 1;
+    //FIXME: float xfactor = (float) config->screenwidth / SCREEN_WIDTH;
+    //FIXME: float yfactor = (float) config->screenheight / SCREEN_HEIGHT;
+    /* FIXME: 
     if(xfactor < yfactor)
     {
       numerator = config->screenwidth;
@@ -621,6 +626,7 @@ namespace SDL
       numerator = config->screenheight;
       denominator = SCREEN_HEIGHT;
     }
+    */
     cache[NO_EFFECT][Color::WHITE] = scale(texture, numerator, denominator);
   }