[Scummvm-cvs-logs] CVS: scummvm/scumm gfx.cpp,2.444,2.445 gfx.h,1.117,1.118 room.cpp,1.11,1.12
Max Horn
fingolfin at users.sourceforge.net
Wed May 11 06:04:28 CEST 2005
Update of /cvsroot/scummvm/scummvm/scumm
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9992
Modified Files:
gfx.cpp gfx.h room.cpp
Log Message:
Made Gdi::_transparentColor protected
Index: gfx.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/gfx.cpp,v
retrieving revision 2.444
retrieving revision 2.445
diff -u -d -r2.444 -r2.445
--- gfx.cpp 30 Apr 2005 15:04:16 -0000 2.444
+++ gfx.cpp 11 May 2005 13:02:36 -0000 2.445
@@ -223,7 +223,7 @@
}
}
-void Gdi::roomChanged(byte *roomptr, uint32 IM00_offs) {
+void Gdi::roomChanged(byte *roomptr, uint32 IM00_offs, byte transparentColor) {
if (_vm->_version == 1) {
if (_vm->_platform == Common::kPlatformNES) {
decodeNESGfx(roomptr);
@@ -241,6 +241,8 @@
} else if (_vm->_version == 2) {
_roomStrips = generateStripTable(roomptr + IM00_offs, _vm->_roomWidth, _vm->_roomHeight, _roomStrips);
}
+
+ _transparentColor = transparentColor;
}
Index: gfx.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/gfx.h,v
retrieving revision 1.117
retrieving revision 1.118
diff -u -d -r1.117 -r1.118
--- gfx.h 28 Apr 2005 22:34:54 -0000 1.117
+++ gfx.h 11 May 2005 13:02:39 -0000 1.118
@@ -196,7 +196,6 @@
ScummEngine *_vm;
public:
- byte _transparentColor;
int _numZBuffer;
int _imgBufOffs[8];
int32 _numStrips;
@@ -206,6 +205,7 @@
protected:
byte *_roomPalette;
+ byte _transparentColor;
byte _decomp_shr, _decomp_mask;
uint32 _vertStripNextInc;
@@ -270,7 +270,7 @@
public:
void init();
- void roomChanged(byte *roomptr, uint32 IM00_offs);
+ void roomChanged(byte *roomptr, uint32 IM00_offs, byte transparentColor);
void drawBitmap(const byte *ptr, VirtScreen *vs, int x, int y, const int width, const int height,
int stripnr, int numstrip, byte flag);
Index: room.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/room.cpp,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- room.cpp 28 Apr 2005 22:34:56 -0000 1.11
+++ room.cpp 11 May 2005 13:02:40 -0000 1.12
@@ -262,7 +262,6 @@
} else {
_IM00_offs = findResource(MKID('IM00'), findResource(MKID('RMIM'), roomptr)) - roomptr;
}
- gdi.roomChanged(roomptr, _IM00_offs);
//
// Look for an exit script
@@ -391,14 +390,15 @@
}
// Transparent color
+ byte trans;
if (_version == 8)
- gdi._transparentColor = (byte)READ_LE_UINT32(&(rmhd->v8.transparency));
+ trans = (byte)READ_LE_UINT32(&(rmhd->v8.transparency));
else {
ptr = findResourceData(MKID('TRNS'), roomptr);
if (ptr)
- gdi._transparentColor = ptr[0];
+ trans = ptr[0];
else
- gdi._transparentColor = 255;
+ trans = 255;
}
// Actor Palette in HE 70 games
@@ -412,6 +412,8 @@
_HEV7ActorPalette[i] = i;
}
}
+
+ gdi.roomChanged(roomptr, _IM00_offs, trans);
}
/**
@@ -579,7 +581,6 @@
} else {
_IM00_offs = READ_LE_UINT16(roomptr + 0x0A);
}
- gdi.roomChanged(roomptr, _IM00_offs);
//
// Look for an exit script
@@ -664,8 +665,7 @@
}
}
- // Transparent color
- gdi._transparentColor = 255;
+ gdi.roomChanged(roomptr, _IM00_offs, 255);
}
void ScummEngine_v3old::initRoomSubBlocks() {
More information about the Scummvm-git-logs
mailing list