aboutsummaryrefslogtreecommitdiff
path: root/scumm/palette_he.cpp
diff options
context:
space:
mode:
authorTravis Howell2005-05-08 10:26:11 +0000
committerTravis Howell2005-05-08 10:26:11 +0000
commit79514d4747eae69ae96ddfb3e5fbb1ff2fe9c787 (patch)
treee49c01ee022e08850c300402ac5e484b12731f69 /scumm/palette_he.cpp
parentfb41dd8284c618460e3b633c38dfb7ab7f41139f (diff)
downloadscummvm-rg350-79514d4747eae69ae96ddfb3e5fbb1ff2fe9c787.tar.gz
scummvm-rg350-79514d4747eae69ae96ddfb3e5fbb1ff2fe9c787.tar.bz2
scummvm-rg350-79514d4747eae69ae96ddfb3e5fbb1ff2fe9c787.zip
Range checks off by 1.
svn-id: r17954
Diffstat (limited to 'scumm/palette_he.cpp')
-rw-r--r--scumm/palette_he.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/scumm/palette_he.cpp b/scumm/palette_he.cpp
index aea7a17605..b681f6fe6e 100644
--- a/scumm/palette_he.cpp
+++ b/scumm/palette_he.cpp
@@ -80,8 +80,8 @@ uint8 *ScummEngine_v90he::getHEPaletteIndex(int palSlot) {
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::getHEPaletteSimilarColor(int palSlot, int red, int green,
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];
}