[Scummvm-cvs-logs] scummvm master -> 551177908510bad6257bec76859bc5d4de8bc932

[digitall]

This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
5511779085 DREAMWEB: Minor removal of runtime residue in vgagrafx.cpp


Commit: 551177908510bad6257bec76859bc5d4de8bc932
    https://github.com/scummvm/scummvm/commit/551177908510bad6257bec76859bc5d4de8bc932
Author: D G Turner (digitall at scummvm.org)
Date: 2011-12-26T18:18:52-08:00

Commit Message:
DREAMWEB: Minor removal of runtime residue in vgagrafx.cpp

Also, minor formatting fixes.

Changed paths:
    engines/dreamweb/vgagrafx.cpp



diff --git a/engines/dreamweb/vgagrafx.cpp b/engines/dreamweb/vgagrafx.cpp
index 33a1770..7e74264 100644
--- a/engines/dreamweb/vgagrafx.cpp
+++ b/engines/dreamweb/vgagrafx.cpp
@@ -281,13 +281,13 @@ void DreamBase::showFrame(const Frame *frameData, uint16 x, uint16 y, uint16 fra
 		return;
 	}
 
-//notBlankShow:
+	// "notBlankShow"
 	if ((effectsFlag & 128) == 0) {
 		x += frame->x;
 		y += frame->y;
 	}
-//skipOffsets:
 
+	// "skipOffsets"
 	*width = frame->width;
 	*height = frame->height;
 	const uint8 *pSrc = ((const uint8 *)frameData) + frame->ptr() + 2080;
@@ -297,27 +297,21 @@ void DreamBase::showFrame(const Frame *frameData, uint16 x, uint16 y, uint16 fra
 			x -= *width / 2;
 			y -= *height / 2;
 		}
-		if (effectsFlag & 64) { //diffDest
+		if (effectsFlag & 64) { // diffDest
 			error("Unsupported DreamBase::showFrame effectsFlag %d", effectsFlag);
 			/*
 			frameOutFx(es.ptr(0, dx * *height), pSrc, dx, *width, *height, x, y);
 			return;
 			*/
 		}
-		if (effectsFlag & 8) { //printList
-			/*
-			push(ax);
-			al = x - data.word(kMapadx);
-			ah = y - data.word(kMapady);
-			//addToPrintList(); // NB: Commented in the original asm
-			ax = pop();
-			*/
+		if (effectsFlag & 8) { // printList
+			//addToPrintList(x - data.word(kMapadx), y - data.word(kMapady)); // NB: Commented in the original asm
 		}
-		if (effectsFlag & 4) { //flippedX
+		if (effectsFlag & 4) { // flippedX
 			frameOutFx(workspace(), pSrc, 320, *width, *height, x, y);
 			return;
 		}
-		if (effectsFlag & 2) { //noMask
+		if (effectsFlag & 2) { // noMask
 			frameOutNm(workspace(), pSrc, 320, *width, *height, x, y);
 			return;
 		}
@@ -326,7 +320,7 @@ void DreamBase::showFrame(const Frame *frameData, uint16 x, uint16 y, uint16 fra
 			return;
 		}
 	}
-//noEffects:
+	// "noEffects"
 	frameOutV(workspace(), pSrc, 320, *width, *height, x, y);
 	return;
 }