src/video/SDL_blit_1.c
changeset 2257 340942cfda48
parent 1895 c121d94672cb
child 2262 bee005ace1bf
     1.1 --- a/src/video/SDL_blit_1.c	Thu Aug 16 22:56:18 2007 +0000
     1.2 +++ b/src/video/SDL_blit_1.c	Fri Aug 17 00:54:53 2007 +0000
     1.3 @@ -290,7 +290,7 @@
     1.4      Uint8 *dst = info->d_pixels;
     1.5      int dstskip = info->d_skip;
     1.6      Uint8 *palmap = info->table;
     1.7 -    Uint32 ckey = info->src->colorkey;
     1.8 +    Uint32 ckey = info->ckey;
     1.9  
    1.10      if (palmap) {
    1.11          while (height--) {
    1.12 @@ -337,7 +337,7 @@
    1.13      Uint16 *dstp = (Uint16 *) info->d_pixels;
    1.14      int dstskip = info->d_skip;
    1.15      Uint16 *palmap = (Uint16 *) info->table;
    1.16 -    Uint32 ckey = info->src->colorkey;
    1.17 +    Uint32 ckey = info->ckey;
    1.18  
    1.19      /* Set up some basic variables */
    1.20      dstskip /= 2;
    1.21 @@ -369,7 +369,7 @@
    1.22      Uint8 *dst = info->d_pixels;
    1.23      int dstskip = info->d_skip;
    1.24      Uint8 *palmap = info->table;
    1.25 -    Uint32 ckey = info->src->colorkey;
    1.26 +    Uint32 ckey = info->ckey;
    1.27      int o;
    1.28  
    1.29      while (height--) {
    1.30 @@ -402,7 +402,7 @@
    1.31      Uint32 *dstp = (Uint32 *) info->d_pixels;
    1.32      int dstskip = info->d_skip;
    1.33      Uint32 *palmap = (Uint32 *) info->table;
    1.34 -    Uint32 ckey = info->src->colorkey;
    1.35 +    Uint32 ckey = info->ckey;
    1.36  
    1.37      /* Set up some basic variables */
    1.38      dstskip /= 4;
    1.39 @@ -436,7 +436,7 @@
    1.40      SDL_PixelFormat *dstfmt = info->dst;
    1.41      const SDL_Color *srcpal = info->src->palette->colors;
    1.42      int dstbpp;
    1.43 -    const int A = info->src->alpha;
    1.44 +    const int A = (info->cmod >> 24);
    1.45  
    1.46      /* Set up some basic variables */
    1.47      dstbpp = dstfmt->BytesPerPixel;
    1.48 @@ -477,9 +477,9 @@
    1.49      SDL_PixelFormat *srcfmt = info->src;
    1.50      SDL_PixelFormat *dstfmt = info->dst;
    1.51      const SDL_Color *srcpal = info->src->palette->colors;
    1.52 -    Uint32 ckey = srcfmt->colorkey;
    1.53 +    Uint32 ckey = info->ckey;
    1.54      int dstbpp;
    1.55 -    const int A = srcfmt->alpha;
    1.56 +    const int A = (info->cmod >> 24);
    1.57  
    1.58      /* Set up some basic variables */
    1.59      dstbpp = dstfmt->BytesPerPixel;