[Pkg-wmaker-commits] [wmbubble] 92/207: Don't bother to test if we should draw the bubble above the water -- we already made sure it was valid before.

[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 6115ca002c768f9273d481393f5640b90b342ffb
Author: Robert Jacobs <rnjacobs at mit.edu>
Date:   Sun Aug 21 01:49:31 2011 -0700

    Don't bother to test if we should draw the bubble above the water -- we already made sure it was valid before.
---
 bubblemon.c | 20 ++++++++------------
 1 file changed, 8 insertions(+), 12 deletions(-)

diff --git a/bubblemon.c b/bubblemon.c
index 9f9eb85..b24693c 100644
--- a/bubblemon.c
+++ b/bubblemon.c
@@ -825,20 +825,16 @@ void draw_watertank(void) {
 
 		/* Top row */
 		bubblebuf_ptr = &(bm.bubblebuf[(((REALY(bm.bubbles[i].y) - 1) * BOX_SIZE) + BOX_SIZE) + bm.bubbles[i].x - 1]);
-		if (bm.bubbles[i].y >= bm.waterlevels[bm.bubbles[i].x]) {
-			if (*bubblebuf_ptr < aircolor) 
-				(*bubblebuf_ptr)++; /* water becomes antialias; antialias becomes air for outside corners */
-			bubblebuf_ptr++;
+		if (*bubblebuf_ptr < aircolor)
+			(*bubblebuf_ptr)++; /* water becomes antialias; antialias becomes air for outside corners */
+		bubblebuf_ptr++;
 			
-			*bubblebuf_ptr = aircolor;
-			bubblebuf_ptr++;
+		*bubblebuf_ptr = aircolor;
+		bubblebuf_ptr++;
 			
-			if (*bubblebuf_ptr < aircolor) 
-				(*bubblebuf_ptr)++;
-			bubblebuf_ptr += BOX_SIZE-2;
-		} else {
-			bubblebuf_ptr += BOX_SIZE;
-		}
+		if (*bubblebuf_ptr < aircolor)
+			(*bubblebuf_ptr)++;
+		bubblebuf_ptr += BOX_SIZE-2;
 		
 		/* Middle row - no color clipping necessary */
 		*bubblebuf_ptr = aircolor;

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