thirdparty/scummvm
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

COMI stores room transparency in RMHD.

Browse source 
Minor cleanup.

svn-id: r15406
This commit is contained in:
Travis Howell 2004-10-04 12:16:52 +00:00
parent 49a3691132
commit 38a7893aa9
3 changed files with 6 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

4
scumm/gfx.cpp
View file

@ -1385,7 +1385,7 @@ void Gdi::drawBMAPBg(const byte *ptr, VirtScreen *vs, int startstrip) {
byte *mask_ptr; byte *mask_ptr;
const byte *zplane_list[9]; const byte *zplane_list[9];
bmap_ptr = _vm->findResource(MKID('BMAP'), ptr) + 8; bmap_ptr = _vm->findResourceData(MKID('BMAP'), ptr);
if (bmap_ptr == NULL) { if (bmap_ptr == NULL) {
error("Gdi::drawBMAPBg: Room %d has no compressed bitmap?", _vm->_roomResource); error("Gdi::drawBMAPBg: Room %d has no compressed bitmap?", _vm->_roomResource);
@ -1430,7 +1430,7 @@ void Gdi::drawBMAPObject(const byte *ptr, VirtScreen *vs, int obj, int x, int y,
warning("drawBMAPObject() called"); warning("drawBMAPObject() called");
bmap_ptr = _vm->findResource(MKID('BMAP'), ptr) + 8; bmap_ptr = _vm->findResourceData(MKID('BMAP'), ptr);
if (bmap_ptr == NULL) { if (bmap_ptr == NULL) {
error("Gdi::drawBMAPObject: No image for item %d?", obj); error("Gdi::drawBMAPObject: No image for item %d?", obj);
return; return;

2
scumm/object.h
View file

@ -62,7 +62,7 @@ struct RoomHeader {
uint32 width, height; uint32 width, height;
uint32 numObjects; uint32 numObjects;
uint32 numZBuffer; uint32 numZBuffer;
uint32 unk2; uint32 transparency;
} GCC_PACK v8; } GCC_PACK v8;
} GCC_PACK; } GCC_PACK;
} GCC_PACK; } GCC_PACK;

6
scumm/scumm.cpp
View file

@ -2287,14 +2287,14 @@ void ScummEngine::initRoomSubBlocks() {
} }
// Transparent color // Transparent color
if (_features & GF_OLD_BUNDLE) if (_version == 8)
gdi._transparentColor = (byte)READ_LE_UINT32(&(rmhd->v8.transparency));
else if (_features & GF_OLD_BUNDLE)
gdi._transparentColor = 255; gdi._transparentColor = 255;
else { else {
ptr = findResourceData(MKID('TRNS'), roomptr); ptr = findResourceData(MKID('TRNS'), roomptr);
if (ptr) if (ptr)
gdi._transparentColor = ptr[0]; gdi._transparentColor = ptr[0];
else if (_version == 8)
gdi._transparentColor = 5;
else else
gdi._transparentColor = 255; gdi._transparentColor = 255;
} }