diff options
| author | Eugene Sandulenko | 2010-09-07 22:10:12 +0000 |
|---|---|---|
| committer | Eugene Sandulenko | 2010-10-12 23:41:13 +0000 |
| commit | 795a6110cb8e4409036ebde2815068564037188a (patch) | |
| tree | e1b5b1f74127f3d6009028440d61e2099fe2a341 | |
| parent | 72dc197885cf9ac0fdacd341adc45e064db1d5ab (diff) | |
| download | scummvm-rg350-795a6110cb8e4409036ebde2815068564037188a.tar.gz scummvm-rg350-795a6110cb8e4409036ebde2815068564037188a.tar.bz2 scummvm-rg350-795a6110cb8e4409036ebde2815068564037188a.zip | |
SWORD25: Fix warnings
svn-id: r53330
| -rwxr-xr-x | engines/sword25/gfx/image/art_svp_intersect.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/engines/sword25/gfx/image/art_svp_intersect.cpp b/engines/sword25/gfx/image/art_svp_intersect.cpp index 231d88d9bb..56164996b6 100755 --- a/engines/sword25/gfx/image/art_svp_intersect.cpp +++ b/engines/sword25/gfx/image/art_svp_intersect.cpp @@ -679,7 +679,7 @@ art_svp_intersect_test_cross(ArtIntersectCtx *ctx, 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 @@ art_svp_intersect_test_cross(ArtIntersectCtx *ctx, 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 @@ art_svp_intersect_test_cross(ArtIntersectCtx *ctx, 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 @@ art_svp_intersect_test_cross(ArtIntersectCtx *ctx, 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) |