src/video/SDL_blit_0.c
changeset 2257 340942cfda48
parent 1895 c121d94672cb
child 2262 bee005ace1bf
     1.1 --- a/src/video/SDL_blit_0.c	Thu Aug 16 22:56:18 2007 +0000
     1.2 +++ b/src/video/SDL_blit_0.c	Fri Aug 17 00:54:53 2007 +0000
     1.3 @@ -200,7 +200,7 @@
     1.4      Uint8 *dst = info->d_pixels;
     1.5      int srcskip = info->s_skip;
     1.6      int dstskip = info->d_skip;
     1.7 -    Uint32 ckey = info->src->colorkey;
     1.8 +    Uint32 ckey = info->ckey;
     1.9      Uint8 *palmap = info->table;
    1.10      int c;
    1.11  
    1.12 @@ -253,7 +253,7 @@
    1.13      Uint16 *dstp = (Uint16 *) info->d_pixels;
    1.14      int srcskip = info->s_skip;
    1.15      int dstskip = info->d_skip;
    1.16 -    Uint32 ckey = info->src->colorkey;
    1.17 +    Uint32 ckey = info->ckey;
    1.18      Uint8 *palmap = info->table;
    1.19      int c;
    1.20  
    1.21 @@ -288,7 +288,7 @@
    1.22      Uint8 *dst = info->d_pixels;
    1.23      int srcskip = info->s_skip;
    1.24      int dstskip = info->d_skip;
    1.25 -    Uint32 ckey = info->src->colorkey;
    1.26 +    Uint32 ckey = info->ckey;
    1.27      Uint8 *palmap = info->table;
    1.28      int c;
    1.29  
    1.30 @@ -322,7 +322,7 @@
    1.31      Uint32 *dstp = (Uint32 *) info->d_pixels;
    1.32      int srcskip = info->s_skip;
    1.33      int dstskip = info->d_skip;
    1.34 -    Uint32 ckey = info->src->colorkey;
    1.35 +    Uint32 ckey = info->ckey;
    1.36      Uint8 *palmap = info->table;
    1.37      int c;
    1.38  
    1.39 @@ -361,7 +361,7 @@
    1.40      SDL_PixelFormat *dstfmt = info->dst;
    1.41      int dstbpp;
    1.42      int c;
    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 @@ -407,8 +407,8 @@
    1.49      const SDL_Color *srcpal = srcfmt->palette->colors;
    1.50      int dstbpp;
    1.51      int c;
    1.52 -    const int A = srcfmt->alpha;
    1.53 -    Uint32 ckey = srcfmt->colorkey;
    1.54 +    const int A = (info->cmod >> 24);
    1.55 +    Uint32 ckey = info->ckey;
    1.56  
    1.57      /* Set up some basic variables */
    1.58      dstbpp = dstfmt->BytesPerPixel;