libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2024-12-19 16:18:45 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix regression when loading icons in Amiga versions of BRA.

Browse Source 
svn-id: r39580
This commit is contained in:
Travis Howell 2009-03-21 01:08:04 +00:00
parent fe62c72e7a
commit bd8b94ee8a
1 changed files with 5 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
engines/parallaction/disk_br.cpp
View File

@ -725,33 +725,28 @@ GfxObj* AmigaDisk_br::loadObjects(const char *name, uint8 part) {
Common::SeekableReadStream *stream = openFile(name); Common::SeekableReadStream *stream = openFile(name);
ILBMDecoder decoder(stream); ILBMDecoder decoder(stream);
Graphics::Surface* surf = new Graphics::Surface;
assert(surf);
surf->w = decoder.getWidth();
surf->h = decoder.getHeight();
surf->pitch = surf->w;
surf->pixels = decoder.getBitmap();
assert(surf->pixels);
uint16 max = objectsMax[part]; uint16 max = objectsMax[part];
if (_vm->getFeatures() & GF_DEMO) if (_vm->getFeatures() & GF_DEMO)
max = 72; max = 72;
byte *data = new byte[max * 2601]; byte *data = new byte[max * 2601];
byte *srcPtr = decoder.getBitmap();
int w = decoder.getWidth();
// Convert to the expected display format // Convert to the expected display format
for (int i = 0; i < max; i++) { for (int i = 0; i < max; i++) {
uint16 x = (i % 8) * 51; uint16 x = (i % 8) * 51;
uint16 y = (i / 8) * 51; uint16 y = (i / 8) * 51;
byte *src = (byte *)surf->getBasePtr(x, y); byte *src = srcPtr + y * w + x;
byte *dst = data + i * 2601; byte *dst = data + i * 2601;
for (int h = 0; h < 51; h++) { for (int h = 0; h < 51; h++) {
memcpy(dst, src, 51); memcpy(dst, src, 51);
src += surf->w; src += w;
dst += 51; dst += 51;
} }
} }
free(srcPtr);
return new GfxObj(0, new Cnv(max, 51, 51, data, true)); return new GfxObj(0, new Cnv(max, 51, 51, data, true));
} }