libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2025-01-11 12:18:05 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

minor cleanup

Browse Source 
svn-id: r25444
This commit is contained in:
Gregory Montoir 2007-02-09 12:27:31 +00:00
parent 3dfd1cbda8
commit c66f919e86
1 changed files with 17 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
engines/agos/res_ami.cpp
View File

@ -21,7 +21,7 @@
* *
*/ */
// Conversion routines for planar graphics in Amiga verisions // Conversion routines for planar graphics in Amiga versions
#include "common/stdafx.h" #include "common/stdafx.h"
#include "agos/agos.h" #include "agos/agos.h"
@ -33,29 +33,23 @@ enum {
kMaxColorDepth = 5 kMaxColorDepth = 5
}; };
static void uncompressplane(const byte *plane, byte *outptr, uint16 length) { static void uncompressplane(const byte *plane, byte *outptr, int length) {
while (length != 0) { while (length != 0) {
int wordlen;
char x = *plane++; char x = *plane++;
if (x >= 0) { if (x >= 0) {
x++; wordlen = MIN<int>(x + 1, length);
byte y = *plane++; uint16 w = READ_UINT16(plane); plane += 2;
byte z = *plane++; for (int i = 0; i < wordlen; ++i) {
while (x != 0) { WRITE_UINT16(outptr, w); outptr += 2;
*outptr++ = y;
*outptr++ = z;
if (--length == 0)
break;
x--;
} }
} else { } else {
while (x != 0) { wordlen = MIN<int>(-x, length);
*outptr++ = *plane++; memcpy(outptr, plane, wordlen * 2);
*outptr++ = *plane++; outptr += wordlen * 2;
if (--length == 0) plane += wordlen * 2;
break;
x++;
}
} }
length -= wordlen;
} }
} }
@ -63,7 +57,7 @@ static void bitplanetochunky(uint16 *w, uint8 colorDepth, uint8 *&dst) {
for (int j = 0; j < 8; j++) { for (int j = 0; j < 8; j++) {
byte color1 = 0; byte color1 = 0;
byte color2 = 0; byte color2 = 0;
for (int p = 0; p < 5; ++p) { for (int p = 0; p < colorDepth; ++p) {
if (w[p] & 0x8000) { if (w[p] & 0x8000) {
color1 |= 1 << p; color1 |= 1 << p;
} }
@ -81,11 +75,10 @@ static void bitplanetochunky(uint16 *w, uint8 colorDepth, uint8 *&dst) {
} }
} }
static void convertcompressedclip(const byte *src, byte *dst, uint8 colorDepth, uint16 height, uint16 width) { static void convertcompressedclip(const byte *src, byte *dst, uint8 colorDepth, int height, int width) {
const byte *plane[kMaxColorDepth]; const byte *plane[kMaxColorDepth];
byte *uncptr[kMaxColorDepth]; byte *uncptr[kMaxColorDepth];
uint32 length, i, j; int length, i, j;
uint16 w[kMaxColorDepth];
byte *uncbfrout = (byte *)malloc(width * height); byte *uncbfrout = (byte *)malloc(width * height);
@ -100,6 +93,7 @@ static void convertcompressedclip(const byte *src, byte *dst, uint8 colorDepth,
byte *uncbfroutptr = uncbfrout; byte *uncbfroutptr = uncbfrout;
for (i = 0; i < length; ++i) { for (i = 0; i < length; ++i) {
uint16 w[kMaxColorDepth];
for (j = 0; j < colorDepth; ++j) { for (j = 0; j < colorDepth; ++j) {
w[j] = READ_BE_UINT16(plane[j]); plane[j] += 2; w[j] = READ_BE_UINT16(plane[j]); plane[j] += 2;
} }
@ -122,10 +116,9 @@ static void convertcompressedclip(const byte *src, byte *dst, uint8 colorDepth,
} }
byte *AGOSEngine::convertclip(const byte *src, bool is32Colors, uint height, uint width, byte flags) { byte *AGOSEngine::convertclip(const byte *src, bool is32Colors, uint height, uint width, byte flags) {
int length, i, j;
uint8 colorDepth = is32Colors ? 5 : 4; uint8 colorDepth = is32Colors ? 5 : 4;
uint32 length, i, j;
free(_planarBuf); free(_planarBuf);
_planarBuf = (byte *)malloc(width * height); _planarBuf = (byte *)malloc(width * height);
byte *dst = _planarBuf; byte *dst = _planarBuf;