Merge lp:~rpadovani/falldown/force-controls into lp:falldown

[Riccardo Padovani]

Force some basic controls to assure there aren't two floors or the last ball disappears without ending the game.

=== modified file 'falldown/components/Ball.qml'
--- falldown/components/Ball.qml	2015-07-06 22:19:43 +0000
+++ falldown/components/Ball.qml	2015-09-13 14:29:00 +0000
@@ -66,6 +66,11 @@
                 if (position < 0) {
                     ballEntity.doDestroy();
                 }
+
+                if (position > game.height + units.gu(5)) {
+                    // If the ball falls in some way out of the game
+                    ballEntity.doDestroy();
+                }
             }
         }
 

=== modified file 'falldown/js/game.js'
--- falldown/js/game.js	2015-08-29 23:58:45 +0000
+++ falldown/js/game.js	2015-09-13 14:29:00 +0000
@@ -31,8 +31,14 @@
 var UPPER_LIMIT_WINE = 1;
 
 var howManyFloorsWithoutPowerUp = 0;
+var floorMutex = false;
 
 function addFloor(width, gu) {
+    // Be sure we don't duplicate floors
+    // https://bugs.launchpad.net/falldown/+bug/1495066
+    if (floorMutex) return;
+    floorMutex = true;
+
     // Choose number of holes in the floor, 90% of times just one
     var numberOfHoles = Math.random() < PERCENTUAL_OF_TWO_HOLES ? 2 : 1;
 
@@ -73,6 +79,8 @@
         thirdFloor.y = gameScene.height;
         thirdFloor.width = width - secondHolePosition - gu * 7 + 10;
     }
+
+    floorMutex = false;
 }
 
 function addBall(x, y) {

=== modified file 'falldown/scenes/EndScene.qml'
--- falldown/scenes/EndScene.qml	2015-09-09 21:27:54 +0000
+++ falldown/scenes/EndScene.qml	2015-09-13 14:29:00 +0000
@@ -153,6 +153,7 @@
                         i18n.tr("Your best score is ") + settings.highScore :
                         i18n.tr("This is your new best score!")
                 font.pixelSize: units.gu(2.5)
+                horizontalAlignment: Text.AlignHCenter
 
                 wrapMode: Text.WordWrap