[Pkg-wmaker-commits] [wmbubble] 85/207: Don't bother to special-case bm.ripples == 0

[Doug Torrance]

This is an automated email from the git hooks/post-receive script.

dtorrance-guest pushed a commit to branch master
in repository wmbubble.

commit e6adc0368520ca8020b2b01cfa448d0444912563
Author: Robert Jacobs <rnjacobs at mit.edu>
Date:   Sat Aug 20 14:11:29 2011 -0700

    Don't bother to special-case bm.ripples == 0
---
 bubblemon.c | 31 ++++++++++++-------------------
 1 file changed, 12 insertions(+), 19 deletions(-)

diff --git a/bubblemon.c b/bubblemon.c
index f8a1b50..2b9e08d 100644
--- a/bubblemon.c
+++ b/bubblemon.c
@@ -788,18 +788,14 @@ void bubblemon_update(int loadPercentage) {
 		         bubbles[bm.n_bubbles].x);
 #endif
 
-		if (bm.ripples_int != 0) {
-			/* Raise the water level above where the bubble is created */
-			if (bubbles[bm.n_bubbles].x > 2)
-				bm.waterlevels[bubbles[bm.n_bubbles].x - 2] -=
-					bm.ripples_int;
-			bm.waterlevels[bubbles[bm.n_bubbles].x - 1] -= bm.ripples_int;
-			bm.waterlevels[bubbles[bm.n_bubbles].x] -= bm.ripples_int;
-			bm.waterlevels[bubbles[bm.n_bubbles].x + 1] -= bm.ripples_int;
-			if (bubbles[bm.n_bubbles].x < (BOX_SIZE-3))
-				bm.waterlevels[bubbles[bm.n_bubbles].x + 2] -=
-					bm.ripples_int;
-		}
+		/* Raise the water level above where the bubble is created */
+		if (bubbles[bm.n_bubbles].x > 2)
+			bm.waterlevels[bubbles[bm.n_bubbles].x - 2] -= bm.ripples_int;
+		bm.waterlevels[bubbles[bm.n_bubbles].x - 1] -= bm.ripples_int;
+		bm.waterlevels[bubbles[bm.n_bubbles].x] -= bm.ripples_int;
+		bm.waterlevels[bubbles[bm.n_bubbles].x + 1] -= bm.ripples_int;
+		if (bubbles[bm.n_bubbles].x < (BOX_SIZE-3))
+			bm.waterlevels[bubbles[bm.n_bubbles].x + 2] -= bm.ripples_int;
 
 		/* Count the new bubble */
 		bm.n_bubbles++;
@@ -839,13 +835,10 @@ void bubblemon_update(int loadPercentage) {
 		
 		/* Did we lose it? */
 		if (bubbles[i].y < bm.waterlevels[bubbles[i].x]) {
-			if (bm.ripples_int != 0) {
-				/* Lower the water level around where the bubble is
-				   about to vanish */
-				bm.waterlevels[bubbles[i].x - 1] += bm.ripples_int;
-				bm.waterlevels[bubbles[i].x] += 3 * bm.ripples_int;
-				bm.waterlevels[bubbles[i].x + 1] += bm.ripples_int;
-			}
+			/* Lower the water level around where the bubble is about to vanish */
+			bm.waterlevels[bubbles[i].x - 1] += bm.ripples_int;
+			bm.waterlevels[bubbles[i].x] += 3 * bm.ripples_int;
+			bm.waterlevels[bubbles[i].x + 1] += bm.ripples_int;
 
 			bubbles[i].x = bubbles[bm.n_bubbles - 1].x;
 			bubbles[i].y = bubbles[bm.n_bubbles - 1].y;

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-wmaker/wmbubble.git