State handling cleanup

The game could end up in funky states when
restarting while the startup animation was
running. Also some smaller fixes for rotation.

2 files changed, 17 insertions, 6 deletions

diff --git a/demos/declarative/snake/content/Link.qml b/demos/declarative/snake/content/Link.qml
index 9aa6006..d5c5773 100644
--- a/demos/declarative/snake/content/Link.qml
+++ b/demos/declarative/snake/content/Link.qml
@@ -77,7 +77,12 @@ Item { id:link
                 id: actualImageRotation
                 origin.x: width/2; origin.y: height/2;
                 angle: rotation * 90
-                Behavior on angle { NumberAnimation { duration: spawned ? 200 : 0} }
+                Behavior on angle {
+                    RotationAnimation{
+                        direction: RotationAnimation.Shortest
+                        duration: spawned ? 200 : 0
+                    }
+                }
             }
         }
 
diff --git a/demos/declarative/snake/content/snake.js b/demos/declarative/snake/content/snake.js
index fab7834..2a99aa8 100644
--- a/demos/declarative/snake/content/snake.js
+++ b/demos/declarative/snake/content/snake.js
@@ -22,20 +22,26 @@ function rand(n)
 
 function scheduleDirection(dir)
 {
-    direction = dir;
-    if(scheduledDirections[scheduledDirections.length-1]!=direction)
-        scheduledDirections.push(direction);
+    if (state == "starting") {
+        direction = dir;
+        headDirection = direction;
+        head.rotation = headDirection;
+    } else if (state == "running"){
+        direction = dir;
+        if(scheduledDirections[scheduledDirections.length-1]!=direction)
+            scheduledDirections.push(direction);
+    }
 }
 
 function startNewGame()
 {
-    if (state == "starting")
+    if (state == "starting") {
         return;
+    }
 
     if (heartbeat.running) {
         endGame();
         startNewGameTimer.running = true;
-        state = "starting";
         return;
     }