X-Git-Url: http://git.hungrycats.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=hacks%2Fglx%2Fflurry-smoke.c;h=245e9f1b1c1867dfa056818277963c25bc215654;hb=4361b69d3178d7fc98d0388f9a223af6c2651aba;hp=c89fe7d1f93aa815f1fc464d88e62ee80da20c4a;hpb=2c902d6065f9856adf31e8540a94f1e42e68e905;p=xscreensaver

diff --git a/hacks/glx/flurry-smoke.c b/hacks/glx/flurry-smoke.c
index c89fe7d1..245e9f1b 100644
--- a/hacks/glx/flurry-smoke.c
+++ b/hacks/glx/flurry-smoke.c
@@ -32,6 +32,10 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 /* Smoke.cpp: implementation of the Smoke class. */
 
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+
 #include "flurry.h"
 
 #define MAXANGLES 16384
@@ -164,7 +168,6 @@ void UpdateSmoke_ScalarBase(global_info_t *global, flurry_info_t *flurry, SmokeV
                 if ((((i*4)+k) % flurry->numStreams) == j) {
                     f *= 1.0f + streamBias;
                 }
-                
                 mag = f / (float) sqrt(rsquared);
                 
                 deltax -= (dx * mag);
@@ -1019,12 +1022,10 @@ void DrawSmoke_Scalar(global_info_t *global, flurry_info_t *flurry, SmokeV *s, f
 					s->p[i].animFrame.i[k] = 0;
 				}
 		
-				u0 = (s->p[i].animFrame.i[k]&&7) * 0.125f;
+				u0 = (s->p[i].animFrame.i[k]& 7) * 0.125f;
 				v0 = (s->p[i].animFrame.i[k]>>3) * 0.125f;
 				u1 = u0 + 0.125f;
 				v1 = v0 + 0.125f;
-				u1 = u0 + 0.125f;
-				v1 = v0 + 0.125f;
 				cm = (1.375f - thisWidth/width);
 				if (s->p[i].dead.i[k] == 3)
 				{