[Scummvm-cvs-logs] SF.net SVN: scummvm:[40986] scummvm/trunk/engines/kyra/screen.cpp

[lordhoto at users.sourceforge.net]

Revision: 40986
          http://scummvm.svn.sourceforge.net/scummvm/?rev=40986&view=rev
Author:   lordhoto
Date:     2009-05-29 11:58:21 +0000 (Fri, 29 May 2009)

Log Message:
-----------
Cleanup.

Modified Paths:
--------------
    scummvm/trunk/engines/kyra/screen.cpp

Modified: scummvm/trunk/engines/kyra/screen.cpp
===================================================================
--- scummvm/trunk/engines/kyra/screen.cpp	2009-05-29 11:47:32 UTC (rev 40985)
+++ scummvm/trunk/engines/kyra/screen.cpp	2009-05-29 11:58:21 UTC (rev 40986)
@@ -1109,7 +1109,7 @@
 	va_list args;
 	va_start(args, flags);
 
-	static int drawShapeVar2[] = {
+	static const int drawShapeVar2[] = {
 		1, 3, 2, 5, 4, 3, 2, 1
 	};
 
@@ -1413,14 +1413,11 @@
 
 	uint8 *d = dst;
 
+	bool normalPlot = true;
 	while (true) {
-		bool normalPlot = true;
-		if (flags & 0x800)
-			normalPlot = (curY > _maskMinY && curY < _maskMaxY);
-
-		while (!(scaleCounterV & 0xff00)) {
+		while (!(scaleCounterV & 0xFF00)) {
 			scaleCounterV += _dsScaleH;
-			if (!(scaleCounterV & 0xff00)) {
+			if (!(scaleCounterV & 0xFF00)) {
 				_dsTmpWidth = shapeWidth;
 				int cnt = shapeWidth;
 				(this->*_dsScaleSkip)(d, s, cnt);
@@ -1437,6 +1434,8 @@
 			if (_dsTmpWidth) {
 				cnt += shpWidthScaled1;
 				if (cnt > 0) {
+					if (flags & 0x800)
+						normalPlot = (curY > _maskMinY && curY < _maskMaxY);
 					_dsPlot = normalPlot ? dsPlot2 : dsPlot3;
 					(this->*_dsProcessLine)(d, s, cnt, scaleState);
 				}
@@ -1447,10 +1446,12 @@
 			dst += dsPitch;
 			d = dst;
 			++curY;
+
 			if (!--shapeHeight)
 				return;
+
 			scaleCounterV -= 0x100;
-		} while (scaleCounterV & 0xff00);
+		} while (scaleCounterV & 0xFF00);
 	}
 
 	va_end(args);


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.