[Scummvm-cvs-logs] CVS: scummvm/scumm palette_he.cpp,1.18,1.19 script_v90he.cpp,2.247,2.248 wiz_he.cpp,2.77,2.78

[kirben]

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

Modified Files:
	palette_he.cpp script_v90he.cpp wiz_he.cpp 
Log Message:

Range checks off by 1.


Index: palette_he.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/palette_he.cpp,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -d -r1.18 -r1.19
--- palette_he.cpp	1 May 2005 14:21:59 -0000	1.18
+++ palette_he.cpp	8 May 2005 10:26:11 -0000	1.19
@@ -80,8 +80,8 @@
 
 int ScummEngine_v90he::getHEPaletteSimilarColor(int palSlot, int red, int green, int start, int end) {
 	checkRange(_numPalettes, 1, palSlot, "Invalid palette %d");
-	assert(start >= 1 && start <= 255);
-	assert(end >= 1 && end <= 255);
+	checkRange(255, 0, start, "Invalid palette slot %d");
+	checkRange(255, 0, end, "Invalid palette slot %d");
 
 	uint8 *pal = _hePalettes + palSlot * 1024 + start * 3;
 
@@ -106,14 +106,14 @@
 
 int ScummEngine_v90he::getHEPaletteColorComponent(int palSlot, int color, int component) {
 	checkRange(_numPalettes, 1, palSlot, "Invalid palette %d");
-	checkRange(255, 1, color, "Invalid palette slot %d");
+	checkRange(255, 0, color, "Invalid palette slot %d");
 
 	return _hePalettes[palSlot * 1024 + color * 3 + component % 3];
 }
 
 int ScummEngine_v90he::getHEPaletteColor(int palSlot, int color) {
 	checkRange(_numPalettes, 1, palSlot, "Invalid palette %d");
-	checkRange(255, 1, color, "Invalid palette slot %d");
+	checkRange(255, 0, color, "Invalid palette slot %d");
 
 	return _hePalettes[palSlot * 1024 + 768 + color];
 }

Index: script_v90he.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/script_v90he.cpp,v
retrieving revision 2.247
retrieving revision 2.248
diff -u -d -r2.247 -r2.248
--- script_v90he.cpp	8 May 2005 03:08:01 -0000	2.247
+++ script_v90he.cpp	8 May 2005 10:26:11 -0000	2.248
@@ -2398,7 +2398,7 @@
 	default:
 		error("o90_getPaletteData: Unknown case %d", subOp);
 	}
-	debug(0,"o90_getPaletteData stub (%d)", subOp);
+	debug(1,"o90_getPaletteData stub (%d)", subOp);
 }
 
 void ScummEngine_v90he::o90_paletteOps() {
@@ -2470,7 +2470,7 @@
 	default:
 		error("o90_paletteOps: Unknown case %d", subOp);
 	}
-	debug(0,"o90_paletteOps (%d)", subOp);
+	debug(1,"o90_paletteOps (%d)", subOp);
 }
 
 

Index: wiz_he.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/wiz_he.cpp,v
retrieving revision 2.77
retrieving revision 2.78
diff -u -d -r2.77 -r2.78
--- wiz_he.cpp	8 May 2005 10:16:41 -0000	2.77
+++ wiz_he.cpp	8 May 2005 10:26:11 -0000	2.78
@@ -1807,7 +1807,7 @@
 	// HE 99+
 	case 7:
 		// Used in PuttsFunShop/SamsFunShop/soccer2004
-		// TODO: Capture polyfon
+		// TODO: Capture polygon
 		break;
 	case 8:
 		createWizEmptyImage(params);