[Scummvm-cvs-logs] SF.net SVN: scummvm:[38896] scummvm/trunk/engines/sci/gfx/gfx_line.cpp

[thebluegr at users.sourceforge.net]

Revision: 38896
          http://scummvm.svn.sourceforge.net/scummvm/?rev=38896&view=rev
Author:   thebluegr
Date:     2009-02-26 10:31:48 +0000 (Thu, 26 Feb 2009)

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

Modified Paths:
--------------
    scummvm/trunk/engines/sci/gfx/gfx_line.cpp

Modified: scummvm/trunk/engines/sci/gfx/gfx_line.cpp
===================================================================
--- scummvm/trunk/engines/sci/gfx/gfx_line.cpp	2009-02-26 09:44:06 UTC (rev 38895)
+++ scummvm/trunk/engines/sci/gfx/gfx_line.cpp	2009-02-26 10:31:48 UTC (rev 38896)
@@ -59,33 +59,13 @@
 	dy = abs(dy);
 
 	if (dx > dy) {
-		if (finalx < x) {
-			if (finaly < y) { // llu == left-left-up
-				LINEMACRO(x, y, dx, dy, x, y, finalx, dx, -PIXELWIDTH, -1);
-			} else {         /* lld */
-				LINEMACRO(x, y, dx, dy, x, y, finalx, dx, -PIXELWIDTH, 1);
-			}
-		} else { // x1 >= x
-			if (finaly < y) { // rru
-				LINEMACRO(x, y, dx, dy, x, y, finalx, dx, PIXELWIDTH, -1);
-			} else {         // rrd
-				LINEMACRO(x, y, dx, dy, x, y, finalx, dx, PIXELWIDTH, 1);
-			}
-		}
+		int sign1 = (finalx < x) ? -1 : 1;
+		int sign2 = (finaly < y) ? -1 : 1;
+		LINEMACRO(x, y, dx, dy, x, y, finalx, dx, sign1 * PIXELWIDTH, sign2);
 	} else { // dx <= dy
-		if (finaly < y) {
-			if (finalx < x) { // luu
-				LINEMACRO(x, y, dy, dx, y, x, finaly, dy, -1, -PIXELWIDTH);
-			} else {         /* ruu */
-				LINEMACRO(x, y, dy, dx, y, x, finaly, dy, -1, PIXELWIDTH);
-			}
-		} else { // y1 >= y
-			if (finalx < x) { // ldd
-				LINEMACRO(x, y, dy, dx, y, x, finaly, dy, 1, -PIXELWIDTH);
-			} else {         // rdd
-				LINEMACRO(x, y, dy, dx, y, x, finaly, dy, 1, PIXELWIDTH);
-			}
-		}
+		int sign1 = (finaly < y) ? -1 : 1;
+		int sign2 = (finalx < x) ? -1 : 1;
+		LINEMACRO(x, y, dy, dx, y, x, finaly, dy, sign1, sign2 * PIXELWIDTH);
 	}
 }
 


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