diff --git a/src/video/SDL_bmp.c b/src/video/SDL_bmp.c
index 46ce28a..5616f05 100644
--- a/src/video/SDL_bmp.c
+++ b/src/video/SDL_bmp.c
@@ -71,15 +71,15 @@
 #define COPY_PIXEL(x)   spot = &bits[ofs++]; if(spot >= start && spot < end) *spot = (x)
 
     for (;;) {
-        if ( !SDL_RWread(src, &ch, 1, 1) ) return 1;
+        if (!SDL_RWread(src, &ch, 1, 1)) return 1;
         /*
         | encoded mode starts with a run length, and then a byte
         | with two colour indexes to alternate between for the run
         */
-        if ( ch ) {
+        if (ch) {
             Uint8 pixel;
-            if ( !SDL_RWread(src, &pixel, 1, 1) ) return 1;
-            if ( isRle8 ) {                 /* 256-color bitmap, compressed */
+            if (!SDL_RWread(src, &pixel, 1, 1)) return 1;
+            if (isRle8) {                   /* 256-color bitmap, compressed */
                 do {
                     COPY_PIXEL(pixel);
                 } while (--ch);
@@ -99,7 +99,7 @@
             | a cursor move, or some absolute data.
             | zero tag may be absolute mode or an escape
             */
-            if ( !SDL_RWread(src, &ch, 1, 1) ) return 1;
+            if (!SDL_RWread(src, &ch, 1, 1)) return 1;
             switch (ch) {
             case 0:                         /* end of line */
                 ofs = 0;
@@ -108,24 +108,24 @@
             case 1:                         /* end of bitmap */
                 return 0;                    /* success! */
             case 2:                         /* delta */
-                if ( !SDL_RWread(src, &ch, 1, 1) ) return 1;
+                if (!SDL_RWread(src, &ch, 1, 1)) return 1;
                 ofs += ch;
-                if ( !SDL_RWread(src, &ch, 1, 1) ) return 1;
+                if (!SDL_RWread(src, &ch, 1, 1)) return 1;
                 bits -= (ch * pitch);
                 break;
             default:                        /* no compression */
                 if (isRle8) {
-                    needsPad = ( ch & 1 );
+                    needsPad = (ch & 1);
                     do {
                         Uint8 pixel;
-                        if ( !SDL_RWread(src, &pixel, 1, 1) ) return 1;
+                        if (!SDL_RWread(src, &pixel, 1, 1)) return 1;
                         COPY_PIXEL(pixel);
                     } while (--ch);
                 } else {
-                    needsPad = ( ((ch+1)>>1) & 1 ); /* (ch+1)>>1: bytes size */
+                    needsPad = (((ch+1)>>1) & 1); /* (ch+1)>>1: bytes size */
                     for (;;) {
                         Uint8 pixel;
-                        if ( !SDL_RWread(src, &pixel, 1, 1) ) return 1;
+                        if (!SDL_RWread(src, &pixel, 1, 1)) return 1;
                         COPY_PIXEL(pixel >> 4);
                         if (!--ch) break;
                         COPY_PIXEL(pixel & 0x0F);
@@ -133,7 +133,7 @@
                     }
                 }
                 /* pad at even boundary */
-                if ( needsPad && !SDL_RWread(src, &ch, 1, 1) ) return 1;
+                if (needsPad && !SDL_RWread(src, &ch, 1, 1)) return 1;
                 break;
             }
         }
@@ -191,7 +191,7 @@
     SDL_bool correctAlpha = SDL_FALSE;
 
     /* The Win32 BMP file header (14 bytes) */
-    char   magic[2];
+    char magic[2];
     Uint32 bfSize;
     Uint16 bfReserved1;
     Uint16 bfReserved2;
@@ -213,7 +213,7 @@
     /* Make sure we are passed a valid data source */
     surface = NULL;
     was_error = SDL_FALSE;
-    if ( src == NULL ) {
+    if (src == NULL) {
         was_error = SDL_TRUE;
         goto done;
     }
@@ -221,12 +221,12 @@
     /* Read in the BMP file header */
     fp_offset = SDL_RWtell(src);
     SDL_ClearError();
-    if ( SDL_RWread(src, magic, 1, 2) != 2 ) {
+    if (SDL_RWread(src, magic, 1, 2) != 2) {
         SDL_Error(SDL_EFREAD);
         was_error = SDL_TRUE;
         goto done;
     }
-    if ( SDL_strncmp(magic, "BM", 2) != 0 ) {
+    if (SDL_strncmp(magic, "BM", 2) != 0) {
         SDL_SetError("File is not a Windows BMP file");
         was_error = SDL_TRUE;
         goto done;
@@ -237,30 +237,30 @@
     bfOffBits   = SDL_ReadLE32(src);
 
     /* Read the Win32 BITMAPINFOHEADER */
-    biSize      = SDL_ReadLE32(src);
-    if ( biSize == 12 ) {   /* really old BITMAPCOREHEADER */
-        biWidth     = (Uint32)SDL_ReadLE16(src);
-        biHeight    = (Uint32)SDL_ReadLE16(src);
-        biPlanes    = SDL_ReadLE16(src);
-        biBitCount  = SDL_ReadLE16(src);
-        biCompression   = BI_RGB;
+    biSize = SDL_ReadLE32(src);
+    if (biSize == 12) {   /* really old BITMAPCOREHEADER */
+        biWidth = (Uint32) SDL_ReadLE16(src);
+        biHeight = (Uint32) SDL_ReadLE16(src);
+        biPlanes = SDL_ReadLE16(src);
+        biBitCount = SDL_ReadLE16(src);
+        biCompression = BI_RGB;
         biSizeImage = 0;
         biXPelsPerMeter = 0;
         biYPelsPerMeter = 0;
-        biClrUsed   = 0;
-        biClrImportant  = 0;
+        biClrUsed = 0;
+        biClrImportant = 0;
     } else if (biSize >= 40) {  /* some version of BITMAPINFOHEADER */
         Uint32 headerSize;
-        biWidth     = SDL_ReadLE32(src);
-        biHeight    = SDL_ReadLE32(src);
-        biPlanes    = SDL_ReadLE16(src);
-        biBitCount  = SDL_ReadLE16(src);
-        biCompression   = SDL_ReadLE32(src);
+        biWidth = SDL_ReadLE32(src);
+        biHeight = SDL_ReadLE32(src);
+        biPlanes = SDL_ReadLE16(src);
+        biBitCount = SDL_ReadLE16(src);
+        biCompression = SDL_ReadLE32(src);
         biSizeImage = SDL_ReadLE32(src);
         biXPelsPerMeter = SDL_ReadLE32(src);
         biYPelsPerMeter = SDL_ReadLE32(src);
-        biClrUsed   = SDL_ReadLE32(src);
-        biClrImportant  = SDL_ReadLE32(src);
+        biClrUsed = SDL_ReadLE32(src);
+        biClrImportant = SDL_ReadLE32(src);
 
         /* 64 == BITMAPCOREHEADER2, an incompatible OS/2 2.x extension. Skip this stuff for now. */
         if (biSize != 64) {
@@ -326,81 +326,82 @@
 
     /* Expand 1 and 4 bit bitmaps to 8 bits per pixel */
     switch (biBitCount) {
-        case 1:
-        case 4:
-            ExpandBMP = biBitCount;
-            biBitCount = 8;
-            break;
-        case 2:
-        case 3:
-        case 5:
-        case 6:
-        case 7:
-            SDL_SetError("%d-bpp BMP images are not supported", biBitCount);
-            was_error = SDL_TRUE;
-            goto done;
-        default:
-            ExpandBMP = 0;
-            break;
+    case 1:
+    case 4:
+        ExpandBMP = biBitCount;
+        biBitCount = 8;
+        break;
+    case 2:
+    case 3:
+    case 5:
+    case 6:
+    case 7:
+        SDL_SetError("%d-bpp BMP images are not supported", biBitCount);
+        was_error = SDL_TRUE;
+        goto done;
+    default:
+        ExpandBMP = 0;
+        break;
     }
 
     /* RLE4 and RLE8 BMP compression is supported */
     switch (biCompression) {
-        case BI_RGB:
-            /* If there are no masks, use the defaults */
-            SDL_assert(!haveRGBMasks);
-            SDL_assert(!haveAlphaMask);
-            /* Default values for the BMP format */
-            switch (biBitCount) {
-            case 15:
-            case 16:
-                Rmask = 0x7C00;
-                Gmask = 0x03E0;
-                Bmask = 0x001F;
-                break;
-            case 24:
-#if SDL_BYTEORDER == SDL_BIG_ENDIAN
-                Rmask = 0x000000FF;
-                Gmask = 0x0000FF00;
-                Bmask = 0x00FF0000;
-#else
-                Rmask = 0x00FF0000;
-                Gmask = 0x0000FF00;
-                Bmask = 0x000000FF;
-#endif
-                break;
-            case 32:
-                /* We don't know if this has alpha channel or not */
-                correctAlpha = SDL_TRUE;
-                Amask = 0xFF000000;
-                Rmask = 0x00FF0000;
-                Gmask = 0x0000FF00;
-                Bmask = 0x000000FF;
-                break;
-            default:
-                break;
-            }
+    case BI_RGB:
+        /* If there are no masks, use the defaults */
+        SDL_assert(!haveRGBMasks);
+        SDL_assert(!haveAlphaMask);
+        /* Default values for the BMP format */
+        switch (biBitCount) {
+        case 15:
+        case 16:
+            Rmask = 0x7C00;
+            Gmask = 0x03E0;
+            Bmask = 0x001F;
             break;
-
-        case BI_BITFIELDS:
-            break;  /* we handled this in the info header. */
-
+        case 24:
+#if SDL_BYTEORDER == SDL_BIG_ENDIAN
+            Rmask = 0x000000FF;
+            Gmask = 0x0000FF00;
+            Bmask = 0x00FF0000;
+#else
+            Rmask = 0x00FF0000;
+            Gmask = 0x0000FF00;
+            Bmask = 0x000000FF;
+#endif
+            break;
+        case 32:
+            /* We don't know if this has alpha channel or not */
+            correctAlpha = SDL_TRUE;
+            Amask = 0xFF000000;
+            Rmask = 0x00FF0000;
+            Gmask = 0x0000FF00;
+            Bmask = 0x000000FF;
+            break;
         default:
             break;
+        }
+        break;
+
+    case BI_BITFIELDS:
+        break;  /* we handled this in the info header. */
+
+    default:
+        break;
     }
 
     /* Create a compatible surface, note that the colors are RGB ordered */
-    surface = SDL_CreateRGBSurface(0,
-            biWidth, biHeight, biBitCount, Rmask, Gmask, Bmask, Amask);
-    if ( surface == NULL ) {
+    surface =
+        SDL_CreateRGBSurface(0, biWidth, biHeight, biBitCount, Rmask, Gmask,
+                             Bmask, Amask);
+    if (surface == NULL) {
         was_error = SDL_TRUE;
         goto done;
     }
 
     /* Load the palette, if any */
     palette = (surface->format)->palette;
-    if ( palette ) {
-        if ( SDL_RWseek(src, fp_offset+14+biSize, RW_SEEK_SET) < 0 ) {
+    if (palette) {
+        if (SDL_RWseek(src, fp_offset+14+biSize, RW_SEEK_SET) < 0) {
             SDL_Error(SDL_EFSEEK);
             was_error = SDL_TRUE;
             goto done;
@@ -410,18 +411,18 @@
         | guich: always use 1<<bpp b/c some bitmaps can bring wrong information
         | for colorsUsed
         */
-        /* if ( biClrUsed == 0 ) {  */
+        /* if (biClrUsed == 0) {  */
         biClrUsed = 1 << biBitCount;
         /* } */
-        if ( biSize == 12 ) {
-            for ( i = 0; i < (int)biClrUsed; ++i ) {
+        if (biSize == 12) {
+            for (i = 0; i < (int) biClrUsed; ++i) {
                 SDL_RWread(src, &palette->colors[i].b, 1, 1);
                 SDL_RWread(src, &palette->colors[i].g, 1, 1);
                 SDL_RWread(src, &palette->colors[i].r, 1, 1);
                 palette->colors[i].a = SDL_ALPHA_OPAQUE;
             }
         } else {
-            for ( i = 0; i < (int)biClrUsed; ++i ) {
+            for (i = 0; i < (int) biClrUsed; ++i) {
                 SDL_RWread(src, &palette->colors[i].b, 1, 1);
                 SDL_RWread(src, &palette->colors[i].g, 1, 1);
                 SDL_RWread(src, &palette->colors[i].r, 1, 1);
@@ -438,7 +439,7 @@
     }
 
     /* Read the surface pixels.  Note that the bmp image is upside down */
-    if ( SDL_RWseek(src, fp_offset+bfOffBits, RW_SEEK_SET) < 0 ) {
+    if (SDL_RWseek(src, fp_offset + bfOffBits, RW_SEEK_SET) < 0) {
         SDL_Error(SDL_EFSEEK);
         was_error = SDL_TRUE;
         goto done;
@@ -451,33 +452,32 @@
     top = (Uint8 *)surface->pixels;
     end = (Uint8 *)surface->pixels+(surface->h*surface->pitch);
     switch (ExpandBMP) {
-        case 1:
-            bmpPitch = (biWidth + 7) >> 3;
-            pad  = (((bmpPitch)%4) ? (4-((bmpPitch)%4)) : 0);
-            break;
-        case 4:
-            bmpPitch = (biWidth + 1) >> 1;
-            pad  = (((bmpPitch)%4) ? (4-((bmpPitch)%4)) : 0);
-            break;
-        default:
-            pad  = ((surface->pitch%4) ?
-                    (4-(surface->pitch%4)) : 0);
-            break;
+    case 1:
+        bmpPitch = (biWidth + 7) >> 3;
+        pad = (((bmpPitch) % 4) ? (4 - ((bmpPitch) % 4)) : 0);
+        break;
+    case 4:
+        bmpPitch = (biWidth + 1) >> 1;
+        pad = (((bmpPitch) % 4) ? (4 - ((bmpPitch) % 4)) : 0);
+        break;
+    default:
+        pad = ((surface->pitch % 4) ? (4 - (surface->pitch % 4)) : 0);
+        break;
     }
-    if ( topDown ) {
+    if (topDown) {
         bits = top;
     } else {
         bits = end - surface->pitch;
     }
-    while ( bits >= top && bits < end ) {
+    while (bits >= top && bits < end) {
         switch (ExpandBMP) {
-            case 1:
-            case 4: {
+        case 1:
+        case 4:{
                 Uint8 pixel = 0;
-                int   shift = (8-ExpandBMP);
-                for ( i=0; i<surface->w; ++i ) {
-                    if ( i%(8/ExpandBMP) == 0 ) {
-                        if ( !SDL_RWread(src, &pixel, 1, 1) ) {
+                int shift = (8 - ExpandBMP);
+                for (i = 0; i < surface->w; ++i) {
+                    if (i % (8 / ExpandBMP) == 0) {
+                        if (!SDL_RWread(src, &pixel, 1, 1)) {
                             SDL_SetError("Error reading from BMP");
                             was_error = SDL_TRUE;
                             goto done;
@@ -494,51 +494,51 @@
             }
             break;
 
-            default:
-                if ( SDL_RWread(src, bits, 1, surface->pitch) != surface->pitch ) {
-                    SDL_Error(SDL_EFREAD);
-                    was_error = SDL_TRUE;
-                    goto done;
-                }
-                if (biBitCount == 8 && palette && biClrUsed < (1 << biBitCount)) {
-                    for (i = 0; i < surface->w; ++i) {
-                        if (bits[i] >= biClrUsed) {
-                            SDL_SetError("A BMP image contains a pixel with a color out of the palette");
-                            was_error = SDL_TRUE;
-                            goto done;
-                        }
+        default:
+            if (SDL_RWread(src, bits, 1, surface->pitch) != surface->pitch) {
+                SDL_Error(SDL_EFREAD);
+                was_error = SDL_TRUE;
+                goto done;
+            }
+            if (biBitCount == 8 && palette && biClrUsed < (1u << biBitCount)) {
+                for (i = 0; i < surface->w; ++i) {
+                    if (bits[i] >= biClrUsed) {
+                        SDL_SetError("A BMP image contains a pixel with a color out of the palette");
+                        was_error = SDL_TRUE;
+                        goto done;
                     }
                 }
+            }
 #if SDL_BYTEORDER == SDL_BIG_ENDIAN
-                /* Byte-swap the pixels if needed. Note that the 24bpp
-                   case has already been taken care of above. */
-                switch(biBitCount) {
-                    case 15:
-                    case 16: {
-                        Uint16 *pix = (Uint16 *)bits;
-                        for(i = 0; i < surface->w; i++)
-                            pix[i] = SDL_Swap16(pix[i]);
-                        break;
-                    }
-
-                    case 32: {
-                        Uint32 *pix = (Uint32 *)bits;
-                        for(i = 0; i < surface->w; i++)
-                            pix[i] = SDL_Swap32(pix[i]);
-                        break;
-                    }
+            /* Byte-swap the pixels if needed. Note that the 24bpp
+               case has already been taken care of above. */
+            switch (biBitCount) {
+            case 15:
+            case 16:{
+                    Uint16 *pix = (Uint16 *) bits;
+                    for (i = 0; i < surface->w; i++)
+                        pix[i] = SDL_Swap16(pix[i]);
+                    break;
                 }
+
+            case 32:{
+                    Uint32 *pix = (Uint32 *) bits;
+                    for (i = 0; i < surface->w; i++)
+                        pix[i] = SDL_Swap32(pix[i]);
+                    break;
+                }
+            }
 #endif
-                break;
+            break;
         }
         /* Skip padding bytes, ugh */
-        if ( pad ) {
+        if (pad) {
             Uint8 padbyte;
-            for ( i=0; i<pad; ++i ) {
+            for (i = 0; i < pad; ++i) {
                 SDL_RWread(src, &padbyte, 1, 1);
             }
         }
-        if ( topDown ) {
+        if (topDown) {
             bits += surface->pitch;
         } else {
             bits -= surface->pitch;
@@ -547,20 +547,20 @@
     if (correctAlpha) {
         CorrectAlphaChannel(surface);
     }
-done:
-    if ( was_error ) {
-        if ( src ) {
+  done:
+    if (was_error) {
+        if (src) {
             SDL_RWseek(src, fp_offset, RW_SEEK_SET);
         }
-        if ( surface ) {
+        if (surface) {
             SDL_FreeSurface(surface);
         }
         surface = NULL;
     }
-    if ( freesrc && src ) {
+    if (freesrc && src) {
         SDL_RWclose(src);
     }
-    return(surface);
+    return (surface);
 }
 
 int