[Scummvm-cvs-logs] SF.net SVN: scummvm:[53330] scummvm/trunk/engines/sword25/gfx/image/ art_svp_intersect.cpp

[sev at users.sourceforge.net]

Revision: 53330
          http://scummvm.svn.sourceforge.net/scummvm/?rev=53330&view=rev
Author:   sev
Date:     2010-10-12 23:41:13 +0000 (Tue, 12 Oct 2010)

Log Message:
-----------
SWORD25: Fix warnings

Modified Paths:
--------------
    scummvm/trunk/engines/sword25/gfx/image/art_svp_intersect.cpp

Modified: scummvm/trunk/engines/sword25/gfx/image/art_svp_intersect.cpp
===================================================================
--- scummvm/trunk/engines/sword25/gfx/image/art_svp_intersect.cpp	2010-10-12 23:40:51 UTC (rev 53329)
+++ scummvm/trunk/engines/sword25/gfx/image/art_svp_intersect.cpp	2010-10-12 23:41:13 UTC (rev 53330)
@@ -679,7 +679,7 @@
 
 		if (left_y1 < right_y1) {
 			/* Test left (x1, y1) against right segment */
-			double left_x1 = left_seg->x[1];
+			left_x1 = left_seg->x[1];
 
 			if (left_x1 <
 			        right_seg->x[(right_seg->flags & ART_ACTIVE_FLAGS_BNEG) ^ 1] ||
@@ -708,14 +708,14 @@
 				return ART_FALSE;
 			else if (d > -EPSILON_A) {
 				/* See above regarding break flags. */
-				double left_x1 = art_svp_intersect_break(ctx, left_seg,
+				left_x1 = art_svp_intersect_break(ctx, left_seg,
 				                 right_x1, right_y1,
 				                 ART_BREAK_LEFT);
 				if (left_x1 <= right_x1)
 					return ART_FALSE;
 			}
 		} else { /* left_y1 == right_y1 */
-			double left_x1 = left_seg->x[1];
+			left_x1 = left_seg->x[1];
 			double right_x1 = right_seg->x[1];
 
 			if (left_x1 <= right_x1)
@@ -727,7 +727,7 @@
 
 	if (left_y1 < right_y1) {
 		/* Test left (x1, y1) against right segment */
-		double left_x1 = left_seg->x[1];
+		left_x1 = left_seg->x[1];
 
 		if (left_x1 <
 		        right_seg->x[(right_seg->flags & ART_ACTIVE_FLAGS_BNEG) ^ 1] ||
@@ -754,14 +754,14 @@
 		if (d > EPSILON_A)
 			return ART_FALSE;
 		else if (d > -EPSILON_A) {
-			double left_x1 = art_svp_intersect_break(ctx, left_seg,
+			left_x1 = art_svp_intersect_break(ctx, left_seg,
 			                 right_x1, right_y1,
 			                 ART_BREAK_LEFT);
 			if (left_x1 <= right_x1)
 				return ART_FALSE;
 		}
 	} else { /* left_y1 == right_y1 */
-		double left_x1 = left_seg->x[1];
+		left_x1 = left_seg->x[1];
 		double right_x1 = right_seg->x[1];
 
 		if (left_x1 <= right_x1)


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