LAB: Rename Image class members

9 files changed, 122 insertions, 122 deletions

diff --git a/engines/lab/graphics.cpp b/engines/lab/graphics.cpp
index 975f054fe1..ce0b49740b 100644
--- a/engines/lab/graphics.cpp
+++ b/engines/lab/graphics.cpp
@@ -267,8 +267,8 @@ uint32 flowTextToMem(Image *destIm, void *font,     /* the TextAttr pointer */
 	uint32 res, vgabyte = g_lab->_screenBytesPerPage;
 	byte *tmp = g_lab->_currentDisplayBuffer;
 
-	g_lab->_currentDisplayBuffer = destIm->ImageData;
-	g_lab->_screenBytesPerPage = (uint32)destIm->Width * (int32)destIm->Height;
+	g_lab->_currentDisplayBuffer = destIm->_imageData;
+	g_lab->_screenBytesPerPage = (uint32)destIm->_width * (int32)destIm->_height;
 
 	res = flowText(font, spacing, pencolor, backpen, fillback, centerh, centerv, output, x1, y1, x2, y2, str);
 
@@ -372,9 +372,9 @@ void LabEngine::doScrollBlack() {
 
 	allocFile((void **)&mem, (int32)width * (int32)height, "Temp Mem");
 
-	im.Width = width;
-	im.Height = height;
-	im.ImageData = mem;
+	im._width = width;
+	im._height = height;
+	im._imageData = mem;
 	_music->updateMusic();
 	im.readScreenImage(0, 0);
 	_music->updateMusic();
@@ -622,13 +622,13 @@ void LabEngine::doTransWipe(CloseDataPtr *cPtr, char *filename) {
 	setPalette(_anim->_diffPalette, 256);
 
 	if (BitMapMem) {
-		imSource.Width = _screenWidth;
-		imSource.Height = lastY;
-		imSource.ImageData = BitMapMem;
+		imSource._width = _screenWidth;
+		imSource._height = lastY;
+		imSource._imageData = BitMapMem;
 
-		imDest.Width = _screenWidth;
-		imDest.Height = _screenHeight;
-		imDest.ImageData = getCurrentDrawingBuffer();
+		imDest._width = _screenWidth;
+		imDest._height = _screenHeight;
+		imDest._imageData = getCurrentDrawingBuffer();
 
 		for (uint16 i = 0; i < 2; i++) {
 			curY = i * 2;
@@ -640,7 +640,7 @@ void LabEngine::doTransWipe(CloseDataPtr *cPtr, char *filename) {
 					linesdone = 0;
 				}
 
-				imDest.ImageData = getCurrentDrawingBuffer();
+				imDest._imageData = getCurrentDrawingBuffer();
 
 				bltBitMap(&imSource, 0, curY, &imDest, 0, curY, _screenWidth, 2);
 				ghoastRect(0, 0, curY, _screenWidth - 1, curY + 1);
@@ -659,7 +659,7 @@ void LabEngine::doTransWipe(CloseDataPtr *cPtr, char *filename) {
 					linesdone = 0;
 				}
 
-				imDest.ImageData = getCurrentDrawingBuffer();
+				imDest._imageData = getCurrentDrawingBuffer();
 
 				if (curY == lastY)
 					bltBitMap(&imSource, 0, curY, &imDest, 0, curY, _screenWidth, 1);
diff --git a/engines/lab/image.cpp b/engines/lab/image.cpp
index 636ac82d29..2107f7af35 100644
--- a/engines/lab/image.cpp
+++ b/engines/lab/image.cpp
@@ -39,17 +39,17 @@ namespace Lab {
 Image::Image(byte **buffer) {
 	uint32 size;
 
-	Width = READ_LE_UINT16(*buffer);
-	Height = READ_LE_UINT16(*buffer + 2);
+	_width = READ_LE_UINT16(*buffer);
+	_height = READ_LE_UINT16(*buffer + 2);
 
 	*buffer += 8; /* sizeof(struct Image); */
 
-	size = Width * Height;
+	size = _width * _height;
 
 	if (1L & size)
 		size++;
 
-	ImageData = (byte *)(*buffer);
+	_imageData = (byte *)(*buffer);
 	(*buffer) += size;
 }
 
@@ -59,8 +59,8 @@ Image::Image(byte **buffer) {
 void Image::drawImage(uint16 x, uint16 y) {
 	int sx = 0, sy = 0;
 	int dx = x, dy = y;
-	int w = Width;
-	int h = Height;
+	int w = _width;
+	int h = _height;
 
 	if (dx < 0) {
 		sx -= dx;
@@ -81,12 +81,12 @@ void Image::drawImage(uint16 x, uint16 y) {
 		h = g_lab->_screenHeight - dy;
 
 	if ((w > 0) && (h > 0)) {
-		byte *s = ImageData + sy * Width + sx;
+		byte *s = _imageData + sy * _width + sx;
 		byte *d = g_lab->getCurrentDrawingBuffer() + dy * g_lab->_screenWidth + dx;
 
 		while (h-- > 0) {
 			memcpy(d, s, w);
-			s += Width;
+			s += _width;
 			d += g_lab->_screenWidth;
 		}
 	}
@@ -98,8 +98,8 @@ void Image::drawImage(uint16 x, uint16 y) {
 void Image::drawMaskImage(uint16 x, uint16 y) {
 	int sx = 0, sy = 0;
 	int dx = x, dy = y;
-	int w = Width;
-	int h = Height;
+	int w = _width;
+	int h = _height;
 
 	if (dx < 0) {
 		sx -= dx;
@@ -120,7 +120,7 @@ void Image::drawMaskImage(uint16 x, uint16 y) {
 		h = g_lab->_screenHeight - dy;
 
 	if ((w > 0) && (h > 0)) {
-		byte *s = ImageData + sy * Width + sx;
+		byte *s = _imageData + sy * _width + sx;
 		byte *d = g_lab->getCurrentDrawingBuffer() + dy * g_lab->_screenWidth + dx;
 
 		while (h-- > 0) {
@@ -135,7 +135,7 @@ void Image::drawMaskImage(uint16 x, uint16 y) {
 				else dd++;
 			}
 
-			s += Width;
+			s += _width;
 			d += g_lab->_screenWidth;
 		}
 	}
@@ -147,8 +147,8 @@ void Image::drawMaskImage(uint16 x, uint16 y) {
 void Image::readScreenImage(uint16 x, uint16 y) {
 	int sx = 0, sy = 0;
 	int	dx = x, dy = y;
-	int w = Width;
-	int h = Height;
+	int w = _width;
+	int h = _height;
 
  	if (dx < 0) {
 		sx -= dx;
@@ -169,12 +169,12 @@ void Image::readScreenImage(uint16 x, uint16 y) {
 		h = g_lab->_screenHeight - dy;
 
 	if ((w > 0) && (h > 0)) {
-		byte *s = ImageData + sy * Width + sx;
+		byte *s = _imageData + sy * _width + sx;
 		byte *d = g_lab->getCurrentDrawingBuffer() + dy * g_lab->_screenWidth + dx;
 
 		while (h-- > 0) {
 			memcpy(s, d, w);
-			s += Width;
+			s += _width;
 			d += g_lab->_screenWidth;
 		}
 	}
diff --git a/engines/lab/image.h b/engines/lab/image.h
index c8a001af4d..2befa93f00 100644
--- a/engines/lab/image.h
+++ b/engines/lab/image.h
@@ -35,12 +35,12 @@ namespace Lab {
 
 class Image {
 public:
-	uint16 Width;
-    uint16 Height;
-	byte *ImageData;
+	uint16 _width;
+    uint16 _height;
+	byte *_imageData;
 
-    Image() : Width(0), Height(0), ImageData(0) {}
-    Image(int w, int h, byte *d) : Width(w), Height(h), ImageData(d) {}
+    Image() : _width(0), _height(0), _imageData(0) {}
+    Image(int w, int h, byte *d) : _width(w), _height(h), _imageData(d) {}
     Image(byte **buffer);
 
     void drawImage(uint16 x, uint16 y);
diff --git a/engines/lab/interface.cpp b/engines/lab/interface.cpp
index d9df22a9b1..ada510bd6e 100644
--- a/engines/lab/interface.cpp
+++ b/engines/lab/interface.cpp
@@ -96,7 +96,7 @@ void drawGadgetList(Gadget *gadlist) {
 /* Ghoasts a gadget, and makes it unavailable for using.                     */
 /*****************************************************************************/
 void ghoastGadget(Gadget *curgad, uint16 pencolor) {
-	g_lab->ghoastRect(pencolor, curgad->x, curgad->y, curgad->x + curgad->_image->Width - 1, curgad->y + curgad->_image->Height - 1);
+	g_lab->ghoastRect(pencolor, curgad->x, curgad->y, curgad->x + curgad->_image->_width - 1, curgad->y + curgad->_image->_height - 1);
 	curgad->GadgetFlags |= GADGETOFF;
 }
 
diff --git a/engines/lab/map.cpp b/engines/lab/map.cpp
index 43f8fd3267..0690ed0fb9 100644
--- a/engines/lab/map.cpp
+++ b/engines/lab/map.cpp
@@ -265,23 +265,23 @@ static void roomCords(uint16 CurRoom, uint16 *x1, uint16 *y1, uint16 *x2, uint16
 	case NORMAL:
 	case UPARROWROOM:
 	case DOWNARROWROOM:
-		(*x2) += Room->Width;
-		(*y2) += Room->Height;
+		(*x2) += Room->_width;
+		(*y2) += Room->_height;
 		break;
 
 	case BRIDGEROOM:
-		(*x2) += Bridge->Width;
-		(*y2) += Bridge->Height;
+		(*x2) += Bridge->_width;
+		(*y2) += Bridge->_height;
 		break;
 
 	case VCORRIDOR:
-		(*x2) += VRoom->Width;
-		(*y2) += VRoom->Height;
+		(*x2) += VRoom->_width;
+		(*y2) += VRoom->_height;
 		break;
 
 	case HCORRIDOR:
-		(*x2) += HRoom->Width;
-		(*y2) += HRoom->Height;
+		(*x2) += HRoom->_width;
+		(*y2) += HRoom->_height;
 		break;
 	}
 }
@@ -308,108 +308,108 @@ static void drawRoom(uint16 CurRoom, bool drawx) {
 		else
 			UpArrowRoom->drawImage(x, y);
 
-		offset = (Room->Width - Path->Width) / 2;
+		offset = (Room->_width - Path->_width) / 2;
 
-		if ((NORTHDOOR & flags) && (y >= Path->Height))
-			Path->drawImage(x + offset, y - Path->Height);
+		if ((NORTHDOOR & flags) && (y >= Path->_height))
+			Path->drawImage(x + offset, y - Path->_height);
 
 		if (SOUTHDOOR & flags)
-			Path->drawImage(x + offset, y + Room->Height);
+			Path->drawImage(x + offset, y + Room->_height);
 
-		offset = (Room->Height - Path->Height) / 2;
+		offset = (Room->_height - Path->_height) / 2;
 
 		if (EASTDOOR & flags)
-			Path->drawImage(x + Room->Width, y + offset);
+			Path->drawImage(x + Room->_width, y + offset);
 
 		if (WESTDOOR & flags)
-			Path->drawImage(x - Path->Width, y + offset);
+			Path->drawImage(x - Path->_width, y + offset);
 
-		xx = x + (Room->Width - XMark->Width) / 2;
-		xy = y + (Room->Height - XMark->Height) / 2;
+		xx = x + (Room->_width - XMark->_width) / 2;
+		xy = y + (Room->_height - XMark->_height) / 2;
 
 		break;
 
 	case BRIDGEROOM:
 		Bridge->drawImage(x, y);
 
-		xx = x + (Bridge->Width - XMark->Width) / 2;
-		xy = y + (Bridge->Height - XMark->Height) / 2;
+		xx = x + (Bridge->_width - XMark->_width) / 2;
+		xy = y + (Bridge->_height - XMark->_height) / 2;
 
 		break;
 
 	case VCORRIDOR:
 		VRoom->drawImage(x, y);
 
-		offset = (VRoom->Width - Path->Width) / 2;
+		offset = (VRoom->_width - Path->_width) / 2;
 
 		if (NORTHDOOR & flags)
-			Path->drawImage(x + offset, y - Path->Height);
+			Path->drawImage(x + offset, y - Path->_height);
 
 		if (SOUTHDOOR & flags)
-			Path->drawImage(x + offset, y + VRoom->Height);
+			Path->drawImage(x + offset, y + VRoom->_height);
 
-		offset = (Room->Height - Path->Height) / 2;
+		offset = (Room->_height - Path->_height) / 2;
 
 		if (EASTDOOR & flags)
-			Path->drawImage(x + VRoom->Width, y + offset);
+			Path->drawImage(x + VRoom->_width, y + offset);
 
 		if (WESTDOOR & flags)
-			Path->drawImage(x - Path->Width, y + offset);
+			Path->drawImage(x - Path->_width, y + offset);
 
 		if (EASTBDOOR & flags)
-			Path->drawImage(x + VRoom->Width, y - offset - Path->Height + VRoom->Height);
+			Path->drawImage(x + VRoom->_width, y - offset - Path->_height + VRoom->_height);
 
 		if (WESTBDOOR & flags)
-			Path->drawImage(x - Path->Width, y - offset - Path->Height + VRoom->Height);
+			Path->drawImage(x - Path->_width, y - offset - Path->_height + VRoom->_height);
 
-		offset = (VRoom->Height - Path->Height) / 2;
+		offset = (VRoom->_height - Path->_height) / 2;
 
 		if (EASTMDOOR & flags)
-			Path->drawImage(x + VRoom->Width, y - offset - Path->Height + VRoom->Height);
+			Path->drawImage(x + VRoom->_width, y - offset - Path->_height + VRoom->_height);
 
 		if (WESTMDOOR & flags)
-			Path->drawImage(x - Path->Width, y - offset - Path->Height + VRoom->Height);
+			Path->drawImage(x - Path->_width, y - offset - Path->_height + VRoom->_height);
 
-		xx = x + (VRoom->Width - XMark->Width) / 2;
-		xy = y + (VRoom->Height - XMark->Height) / 2;
+		xx = x + (VRoom->_width - XMark->_width) / 2;
+		xy = y + (VRoom->_height - XMark->_height) / 2;
 
 		break;
 
 	case HCORRIDOR:
 		HRoom->drawImage(x, y);
 
-		offset = (Room->Width - Path->Width) / 2;
+		offset = (Room->_width - Path->_width) / 2;
 
 		if (NORTHDOOR & flags)
-			Path->drawImage(x + offset, y - Path->Height);
+			Path->drawImage(x + offset, y - Path->_height);
 
 		if (SOUTHDOOR & flags)
-			Path->drawImage(x + offset, y + Room->Height);
+			Path->drawImage(x + offset, y + Room->_height);
 
 		if (NORTHRDOOR & flags)
-			Path->drawImage(x - offset - Path->Width + HRoom->Width, y - Path->Height);
+			Path->drawImage(x - offset - Path->_width + HRoom->_width, y - Path->_height);
 
 		if (SOUTHRDOOR & flags)
-			Path->drawImage(x - offset - Path->Width + HRoom->Width, y + Room->Height);
+			Path->drawImage(x - offset - Path->_width + HRoom->_width, y + Room->_height);
 
-		offset = (HRoom->Width - Path->Width) / 2;
+		offset = (HRoom->_width - Path->_width) / 2;
 
 		if (NORTHMDOOR & flags)
-			Path->drawImage(x - offset - Path->Width + HRoom->Width, y - Path->Height);
+			Path->drawImage(x - offset - Path->_width + HRoom->_width, y - Path->_height);
 
 		if (SOUTHMDOOR & flags)
-			Path->drawImage(x - offset - Path->Width + HRoom->Width, y + Room->Height);
+			Path->drawImage(x - offset - Path->_width + HRoom->_width, y + Room->_height);
 
-		offset = (Room->Height - Path->Height) / 2;
+		offset = (Room->_height - Path->_height) / 2;
 
 		if (EASTDOOR & flags)
-			Path->drawImage(x + HRoom->Width, y + offset);
+			Path->drawImage(x + HRoom->_width, y + offset);
 
 		if (WESTDOOR & flags)
-			Path->drawImage(x - Path->Width, y + offset);
+			Path->drawImage(x - Path->_width, y + offset);
 
-		xx = x + (HRoom->Width - XMark->Width) / 2;
-		xy = y + (HRoom->Height - XMark->Height) / 2;
+		xx = x + (HRoom->_width - XMark->_width) / 2;
+		xy = y + (HRoom->_height - XMark->_height) / 2;
 
 		break;
 
diff --git a/engines/lab/mouse.cpp b/engines/lab/mouse.cpp
index b676f2cd37..45dd53f5c3 100644
--- a/engines/lab/mouse.cpp
+++ b/engines/lab/mouse.cpp
@@ -61,8 +61,8 @@ static byte MouseData[] = {1, 1, 0, 0, 0, 0, 0, 0, 0, 0,
 Gadget *EventManager::checkGadgetHit(Gadget *gadgetList, Common::Point pos) {
 	while (gadgetList != NULL) {
 		if ((pos.x >= gadgetList->x) && (pos.y >= gadgetList->y) &&
-		    (pos.x <= (gadgetList->x + gadgetList->_image->Width)) &&
-		    (pos.y <= (gadgetList->y + gadgetList->_image->Height)) &&
+		    (pos.x <= (gadgetList->x + gadgetList->_image->_width)) &&
+		    (pos.y <= (gadgetList->y + gadgetList->_image->_height)) &&
 		     !(GADGETOFF & gadgetList->GadgetFlags)) {
 			if (_vm->_isHiRes) {
 				_hitGadget = gadgetList;
diff --git a/engines/lab/resource.cpp b/engines/lab/resource.cpp
index b1ad5284ba..70233dedd4 100644
--- a/engines/lab/resource.cpp
+++ b/engines/lab/resource.cpp
@@ -300,7 +300,7 @@ CloseData *Resource::readCloseUps(uint16 depth, Common::File *file) {
 			prev = closeup;
 		}
 	} while (c != '\0');
-	
+
 	return head;
 }
 
diff --git a/engines/lab/special.cpp b/engines/lab/special.cpp
index 6c5ff021a8..4d71b443e1 100644
--- a/engines/lab/special.cpp
+++ b/engines/lab/special.cpp
@@ -155,7 +155,7 @@ void showCombination(const char *filename) {
 	for (uint16 CurBit = 0; CurBit < 10; CurBit++)
 		Images[CurBit] = new Image(buffer);
 
-	allocFile((void **)&g_lab->_tempScrollData, Images[0]->Width * Images[0]->Height * 2L, "tempdata");
+	allocFile((void **)&g_lab->_tempScrollData, Images[0]->_width * Images[0]->_height * 2L, "tempdata");
 
 	doCombination();
 
@@ -179,22 +179,22 @@ static void changeCombination(uint16 number) {
 
 	combnum = combination[number];
 
-	display.ImageData = g_lab->getCurrentDrawingBuffer();
-	display.Width     = g_lab->_screenWidth;
-	display.Height    = g_lab->_screenHeight;
+	display._imageData = g_lab->getCurrentDrawingBuffer();
+	display._width     = g_lab->_screenWidth;
+	display._height    = g_lab->_screenHeight;
 
-	for (uint16 i = 1; i <= (Images[combnum]->Height / 2); i++) {
+	for (uint16 i = 1; i <= (Images[combnum]->_height / 2); i++) {
 		if (g_lab->_isHiRes) {
 			if (i & 1)
 				g_lab->waitTOF();
 		} else
 			g_lab->waitTOF();
 
-		display.ImageData = g_lab->getCurrentDrawingBuffer();
+		display._imageData = g_lab->getCurrentDrawingBuffer();
 
-		g_lab->scrollDisplayY(2, VGAScaleX(combx[number]), VGAScaleY(65), VGAScaleX(combx[number]) + (Images[combnum])->Width - 1, VGAScaleY(65) + (Images[combnum])->Height);
+		g_lab->scrollDisplayY(2, VGAScaleX(combx[number]), VGAScaleY(65), VGAScaleX(combx[number]) + (Images[combnum])->_width - 1, VGAScaleY(65) + (Images[combnum])->_height);
 
-		g_lab->bltBitMap(Images[combnum], 0, (Images[combnum])->Height - (2 * i), &(display), VGAScaleX(combx[number]), VGAScaleY(65), (Images[combnum])->Width, 2);
+		g_lab->bltBitMap(Images[combnum], 0, (Images[combnum])->_height - (2 * i), &(display), VGAScaleX(combx[number]), VGAScaleY(65), (Images[combnum])->_width, 2);
 	}
 
 	for (uint16 i = 0; i < 6; i++)
@@ -306,7 +306,7 @@ void showTile(const char *filename, bool showsolution) {
 	for (uint16 curBit = start; curBit < 16; curBit++)
 		Tiles[curBit] = new Image(buffer);
 
-	allocFile((void **)&g_lab->_tempScrollData, Tiles[1]->Width * Tiles[1]->Height * 2L, "tempdata");
+	allocFile((void **)&g_lab->_tempScrollData, Tiles[1]->_width * Tiles[1]->_height * 2L, "tempdata");
 
 	doTile(showsolution);
 
@@ -625,14 +625,14 @@ static void turnPage(bool FromLeft) {
 		for (int i = 0; i < g_lab->_screenWidth; i += 8) {
 			g_lab->_music->updateMusic();
 			g_lab->waitTOF();
-			ScreenImage.ImageData = g_lab->getCurrentDrawingBuffer();
+			ScreenImage._imageData = g_lab->getCurrentDrawingBuffer();
 			g_lab->bltBitMap(&JBackImage, i, 0, &ScreenImage, i, 0, 8, g_lab->_screenHeight);
 		}
 	} else {
 		for (int i = (g_lab->_screenWidth - 8); i > 0; i -= 8) {
 			g_lab->_music->updateMusic();
 			g_lab->waitTOF();
-			ScreenImage.ImageData = g_lab->getCurrentDrawingBuffer();
+			ScreenImage._imageData = g_lab->getCurrentDrawingBuffer();
 			g_lab->bltBitMap(&JBackImage, i, 0, &ScreenImage, i, 0, 8, g_lab->_screenHeight);
 		}
 	}
@@ -648,11 +648,11 @@ void LabEngine::drawJournal(uint16 wipenum, bool needFade) {
 	_music->updateMusic();
 
 	if (!GotBackImage)
-		JBackImage.ImageData = loadBackPict("P:Journal.pic", true);
+		JBackImage._imageData = loadBackPict("P:Journal.pic", true);
 
 	drawJournalText();
 
-	ScreenImage.ImageData = getCurrentDrawingBuffer();
+	ScreenImage._imageData = getCurrentDrawingBuffer();
 
 	if (wipenum == 0)
 		bltBitMap(&JBackImage, 0, 0, &ScreenImage, 0, 0, _screenWidth, _screenHeight);
@@ -674,7 +674,7 @@ void LabEngine::drawJournal(uint16 wipenum, bool needFade) {
 		fade(true, 0);
 
 	g_lab->_anim->_noPalChange = true;
-	JBackImage.ImageData = readPictToMem("P:Journal.pic", _screenWidth, _screenHeight);
+	JBackImage._imageData = readPictToMem("P:Journal.pic", _screenWidth, _screenHeight);
 	GotBackImage = true;
 
 	eatMessages();
@@ -735,15 +735,15 @@ void LabEngine::doJournal() {
 	lastpage    = false;
 	GotBackImage = false;
 
-	JBackImage.Width = _screenWidth;
-	JBackImage.Height = _screenHeight;
-	JBackImage.ImageData   = NULL;
+	JBackImage._width = _screenWidth;
+	JBackImage._height = _screenHeight;
+	JBackImage._imageData   = NULL;
 
 	BackG.NextGadget = &CancelG;
 	CancelG.NextGadget = &ForwardG;
 
 	ScreenImage = JBackImage;
-	ScreenImage.ImageData = getCurrentDrawingBuffer();
+	ScreenImage._imageData = getCurrentDrawingBuffer();
 
 	_music->updateMusic();
 	loadJournalData();
@@ -757,7 +757,7 @@ void LabEngine::doJournal() {
 	fade(false, 0);
 	_event->mouseHide();
 
-	ScreenImage.ImageData = getCurrentDrawingBuffer();
+	ScreenImage._imageData = getCurrentDrawingBuffer();
 
 	setAPen(0);
 	rectFill(0, 0, _screenWidth - 1, _screenHeight - 1);
@@ -844,8 +844,8 @@ void LabEngine::drawMonText(char *text, TextFont *monitorFont, uint16 x1, uint16
 		text += 2;
 
 		fheight = textHeight(monitorFont);
-		x1 = MonButton->Width + VGAScaleX(3);
-		MonGadHeight = MonButton->Height + VGAScaleY(3);
+		x1 = MonButton->_width + VGAScaleX(3);
+		MonGadHeight = MonButton->_height + VGAScaleY(3);
 
 		if (MonGadHeight > fheight)
 			yspacing = MonGadHeight - fheight;
diff --git a/engines/lab/vga.cpp b/engines/lab/vga.cpp
index 3525e779b2..9ccb5f5c54 100644
--- a/engines/lab/vga.cpp
+++ b/engines/lab/vga.cpp
@@ -169,20 +169,20 @@ void LabEngine::bltBitMap(Image *imSource, uint16 xs, uint16 ys, Image *imDest,
 		dy = 0;
 	}
 
-	if (dx + w > imDest->Width)
-		w = imDest->Width - dx;
+	if (dx + w > imDest->_width)
+		w = imDest->_width - dx;
 
-	if (dy + h > imDest->Height)
-		h = imDest->Height - dy;
+	if (dy + h > imDest->_height)
+		h = imDest->_height - dy;
 
 	if (w > 0 && h > 0) {
-		byte *s = imSource->ImageData + sy * imSource->Width + sx;
-		byte *d = imDest->ImageData + dy * imDest->Width + dx;
+		byte *s = imSource->_imageData + sy * imSource->_width + sx;
+		byte *d = imDest->_imageData + dy * imDest->_width + dx;
 
 		while (h-- > 0) {
 			memcpy(d, s, w);
-			s += imSource->Width;
-			d += imDest->Width;
+			s += imSource->_width;
+			d += imDest->_width;
 		}
 	}
 }
@@ -196,7 +196,7 @@ void LabEngine::scrollDisplayX(int16 dx, uint16 x1, uint16 y1, uint16 x2, uint16
 	Image im;
 	uint16 temp;
 
-	im.ImageData = _tempScrollData;
+	im._imageData = _tempScrollData;
 
 	if (x1 > x2) {
 		temp = x2;
@@ -211,8 +211,8 @@ void LabEngine::scrollDisplayX(int16 dx, uint16 x1, uint16 y1, uint16 x2, uint16
 	}
 
 	if (dx > 0) {
-		im.Width = x2 - x1 + 1 - dx;
-		im.Height = y2 - y1 + 1;
+		im._width = x2 - x1 + 1 - dx;
+		im._height = y2 - y1 + 1;
 
 		im.readScreenImage(x1, y1);
 		im.drawImage(x1 + dx, y1);
@@ -220,8 +220,8 @@ void LabEngine::scrollDisplayX(int16 dx, uint16 x1, uint16 y1, uint16 x2, uint16
 		setAPen(0);
 		rectFill(x1, y1, x1 + dx - 1, y2);
 	} else if (dx < 0) {
-		im.Width = x2 - x1 + 1 + dx;
-		im.Height = y2 - y1 + 1;
+		im._width = x2 - x1 + 1 + dx;
+		im._height = y2 - y1 + 1;
 
 		im.readScreenImage(x1 - dx, y1);
 		im.drawImage(x1, y1);
@@ -238,7 +238,7 @@ void LabEngine::scrollDisplayY(int16 dy, uint16 x1, uint16 y1, uint16 x2, uint16
 	Image im;
 	uint16 temp;
 
-	im.ImageData = _tempScrollData;
+	im._imageData = _tempScrollData;
 
 	if (x1 > x2) {
 		temp = x2;
@@ -253,8 +253,8 @@ void LabEngine::scrollDisplayY(int16 dy, uint16 x1, uint16 y1, uint16 x2, uint16
 	}
 
 	if (dy > 0) {
-		im.Width = x2 - x1 + 1;
-		im.Height = y2 - y1 + 1 - dy;
+		im._width = x2 - x1 + 1;
+		im._height = y2 - y1 + 1 - dy;
 
 		im.readScreenImage(x1, y1);
 		im.drawImage(x1, y1 + dy);
@@ -262,8 +262,8 @@ void LabEngine::scrollDisplayY(int16 dy, uint16 x1, uint16 y1, uint16 x2, uint16
 		setAPen(0);
 		rectFill(x1, y1, x2, y1 + dy - 1);
 	} else if (dy < 0) {
-		im.Width = x2 - x1 + 1;
-		im.Height = y2 - y1 + 1 + dy;
+		im._width = x2 - x1 + 1;
+		im._height = y2 - y1 + 1 + dy;
 
 		im.readScreenImage(x1, y1 - dy);
 		im.drawImage(x1, y1);