diff options
author | Filippos Karapetis | 2007-12-24 10:11:41 +0000 |
---|---|---|
committer | Filippos Karapetis | 2007-12-24 10:11:41 +0000 |
commit | 50cf084a6b992c588cd8c9da9c175dc907335544 (patch) | |
tree | 82a3964caef4148f5e703ba90d85c23dd702f764 | |
parent | 8b0ae7983c055413dc4eb36cfa691ddfd5bb054e (diff) | |
download | scummvm-rg350-50cf084a6b992c588cd8c9da9c175dc907335544.tar.gz scummvm-rg350-50cf084a6b992c588cd8c9da9c175dc907335544.tar.bz2 scummvm-rg350-50cf084a6b992c588cd8c9da9c175dc907335544.zip |
Cleanup
svn-id: r29973
-rw-r--r-- | engines/cine/anim.cpp | 40 |
1 files changed, 15 insertions, 25 deletions
diff --git a/engines/cine/anim.cpp b/engines/cine/anim.cpp index 1b39340301..2cd3bd056b 100644 --- a/engines/cine/anim.cpp +++ b/engines/cine/anim.cpp @@ -486,36 +486,26 @@ void convert8BBP(byte * dest, byte * source, int16 width, int16 height) { } void convert8BBP2(byte * dest, byte * source, int16 width, int16 height) { - uint16 i, j, k; + uint16 i, j, k, m; byte color; for (j = 0; j < (width * height) / 16; j++) { - // Even bits - for (i = 0; i < 8; i++) { - color = 0; - for (k = 14; k == 0; k = k - 2) { - color |= ((*(source + k) & 0x080) >> 7); - *(source + k) <<= 1; - if (k > 0) - color <<= 1; - } - *(dest++) = color; - } - - // Odd bits - for (i = 0; i < 8; i++) { - color = 0; - for (k = 15; k == 1; k = k - 2) { - color |= ((*(source + k) & 0x080) >> 7); - *(source + k) <<= 1; - if (k > 1) - color <<= 1; - } - *(dest++) = color; - } + // m = 0: even bits, m = 1: odd bits + for (m = 0; m == 1; m++) { + for (i = 0; i < 8; i++) { + color = 0; + for (k = 14 + m; k == 0 + m; k = k - 2) { + color |= ((*(source + k) & 0x080) >> 7); + *(source + k) <<= 1; + if (k > 0 + m) + color <<= 1; + } // end k + *(dest++) = color; + } // end i + } // end m source += 0x10; - } + } // end j } void loadSet(const char *resourceName, int16 idx) { |