[Scummvm-cvs-logs] CVS: scummvm/scumm resource.cpp,1.281,1.282 gfx.cpp,2.365,2.366

Max Horn fingolfin at users.sourceforge.net
Thu Oct 7 09:11:38 CEST 2004


Update of /cvsroot/scummvm/scummvm/scumm
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18885

Modified Files:
	resource.cpp gfx.cpp 
Log Message:
Adjusted come comments

Index: resource.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/resource.cpp,v
retrieving revision 1.281
retrieving revision 1.282
diff -u -d -r1.281 -r1.282
--- resource.cpp	4 Oct 2004 02:23:01 -0000	1.281
+++ resource.cpp	7 Oct 2004 16:09:29 -0000	1.282
@@ -594,7 +594,7 @@
 			readResTypeList(rtRoomImage, MKID('RMIM'), "room image");
 			break;
 
-		case MKID('ANAM'):
+		case MKID('ANAM'):		// Used by: The Dig, FT
 			debug(9, "found ANAM block, reading audio names");
 			_numAudioNames = _fileHandle.readUint16LE();
 			_audioNames = (char*)malloc(_numAudioNames * 9);

Index: gfx.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/gfx.cpp,v
retrieving revision 2.365
retrieving revision 2.366
diff -u -d -r2.365 -r2.366
--- gfx.cpp	7 Oct 2004 06:54:33 -0000	2.365
+++ gfx.cpp	7 Oct 2004 16:09:30 -0000	2.366
@@ -1373,8 +1373,8 @@
  * Draw a bitmap onto a virtual screen. This is main drawing method for room backgrounds
  * used throughout in 7.2+ HE versions.
  *
- * TODO: This function essentially is a stripped down & special cased version of
- * the generic Gdi::drawBitmap() method. We might consider merging those two.
+ * @note This function essentially is a stripped down & special cased version of
+ * the generic Gdi::drawBitmap() method.
  */
 void Gdi::drawBMAPBg(const byte *ptr, VirtScreen *vs, int startstrip) {
 	assert(ptr);
@@ -1389,7 +1389,7 @@
 
 	code = *bmap_ptr++;
 
-	// TODO: The following few lines more or less duplicate decompressBitmap(), only
+	// The following few lines more or less duplicate decompressBitmap(), only
 	// for an area spanning multiple strips. In particular, the codecs 13 & 14
 	// in decompressBitmap call drawStripHE()
 	if (code == 150) {
@@ -1705,8 +1705,8 @@
 }
 
 void Gdi::copyVirtScreenBuffers(const Common::Rect &rect) {
-	int rw = rect.right - rect.left;
-	int rh = rect.bottom - rect.top;
+	const int rw = rect.width();
+	const int rh = rect.height();
 	byte *src, *dst;
 	
 	src = _vm->virtscr[0].getBackPixels(rect.left, rect.top);





More information about the Scummvm-git-logs mailing list