Turn off snowflake interaction when set to false.

1 files changed, 22 insertions, 13 deletions

diff --git a/movement.c b/movement.c
index a2e94f1..d5787f7 100644
--- a/movement.c
+++ b/movement.c
@@ -52,25 +52,34 @@ SnowflakeDrift (CompScreen *s, int index)
 
     float sideways = 2*(randf(2*speed)-speed);
     float vertical = -speed;
+
+    if (snowglobeGetShakeCube(s))
+    {
+	x+= sideways*cosf(as->xRotate*toRadians)*cosf(as->vRotate*toRadians)
+	   -vertical*cosf(as->xRotate*toRadians)*sinf(as->vRotate*toRadians);
+	
+    	y+= sideways*sinf(as->xRotate*toRadians)*cosf(as->vRotate*toRadians)
+    	   +vertical*sinf(as->xRotate*toRadians)*sinf(as->vRotate*toRadians);
+    	
+	z+= sideways*sinf(as->vRotate*toRadians)+vertical*cosf(as->vRotate*toRadians);
+    }
+    else
+    {
+	x+=sideways;
+    	y+=sideways;
+	z+=vertical;
+    }
     
-    z+=sideways*sinf(as->vRotate*toRadians)+vertical*cosf(as->vRotate*toRadians);
-    x+=sideways*cosf(as->xRotate*toRadians)*cosf(as->vRotate*toRadians)-vertical*cosf(as->xRotate*toRadians)*sinf(as->vRotate*toRadians);
-    y+=sideways*sinf(as->xRotate*toRadians)*cosf(as->vRotate*toRadians)+vertical*sinf(as->xRotate*toRadians)*sinf(as->vRotate*toRadians);
 
     float bottom = (renderGround ? getHeight(as->ground, x, y) : -0.5)+0.01*snow->size/2;
 
     if (z<bottom)
     {
-	//if (snowglobeGetShakeCube(s))
-	//{
-	//    z = bottom;
-	//}
-	//else {
-	    z = 0.5;
-	    newSnowflakePosition(as, index);
-	//}
-	    x = snow->x;
-	    y = snow->y;
+	z = 0.5;
+	newSnowflakePosition(as, index);
+	    
+	x = snow->x;
+	y = snow->y;
     }
 
     float top = 0.5-0.01*snow->size/2;