aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPaul Gilbert2011-06-28 21:58:03 +1000
committerPaul Gilbert2011-06-28 21:58:03 +1000
commit2fe6061d919a84e1f2849415902b3e91403bf69d (patch)
treecd7f09457f3576b364552a439a9b9da34a1e9294
parent571c3fc666ce95ce880e7a428585ea99c7c66fd2 (diff)
downloadscummvm-rg350-2fe6061d919a84e1f2849415902b3e91403bf69d.tar.gz
scummvm-rg350-2fe6061d919a84e1f2849415902b3e91403bf69d.tar.bz2
scummvm-rg350-2fe6061d919a84e1f2849415902b3e91403bf69d.zip
CGE: Bitmap now shows correctly
-rw-r--r--engines/cge/vga13h.cpp6
1 files changed, 4 insertions, 2 deletions
diff --git a/engines/cge/vga13h.cpp b/engines/cge/vga13h.cpp
index 32e0fd6090..21aec31e5d 100644
--- a/engines/cge/vga13h.cpp
+++ b/engines/cge/vga13h.cpp
@@ -1261,8 +1261,8 @@ void BITMAP::Show(int x, int y) {
// must be decompressed and inserted into the surface
for (int planeCtr = 0; planeCtr < 4; ++planeCtr) {
destP = (byte *)rawSurface.getBasePtr(planeCtr, 0);
-
- while (destP < destEndP) {
+
+ for (;;) {
uint16 v = READ_LE_UINT16(srcP);
srcP += 2;
int cmd = v >> 14;
@@ -1273,6 +1273,8 @@ void BITMAP::Show(int x, int y) {
break;
}
+ assert(destP < destEndP);
+
// Handle a set of pixels
while (count-- > 0) {
// Transfer operation