diff options
| author | Alan Alpert <alan.alpert@nokia.com> | 2010-07-19 03:07:07 (GMT) |
|---|---|---|
| committer | Jason McDonald <jason.mcdonald@nokia.com> | 2010-07-19 10:17:53 (GMT) |
| commit | 6f0d46bbd3203fb1378234e37307800566588aca (patch) | |
| tree | 0cab7383701d4f5676b16b9d53a833094c88f92b /demos/declarative/samegame | |
| parent | 8ec06dbfdcbb43b6b02523247a6e88c61b4e0011 (diff) | |
| download | Qt-6f0d46bbd3203fb1378234e37307800566588aca.zip Qt-6f0d46bbd3203fb1378234e37307800566588aca.tar.gz Qt-6f0d46bbd3203fb1378234e37307800566588aca.tar.bz2 | |
Fix Samegame
Change to Behavior from Follow means that some of the previous
assumptions are now incorrect. Script logic has been fixed.
Task-number: QTBUG-12246
(cherry picked from commit 9e4fb690b864f8d0c05d70687a3498b9eb9b2ed5)
Diffstat (limited to 'demos/declarative/samegame')
| -rwxr-xr-x | demos/declarative/samegame/SamegameCore/samegame.js | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/demos/declarative/samegame/SamegameCore/samegame.js b/demos/declarative/samegame/SamegameCore/samegame.js index 6e1b24d..aa1b359 100755 --- a/demos/declarative/samegame/SamegameCore/samegame.js +++ b/demos/declarative/samegame/SamegameCore/samegame.js @@ -110,7 +110,7 @@ function shuffleDown() }else{ if(fallDist > 0){ var obj = board[index(column,row)]; - obj.y += fallDist * gameCanvas.blockSize; + obj.y = (row+fallDist) * gameCanvas.blockSize; board[index(column,row+fallDist)] = obj; board[index(column,row)] = null; } @@ -128,7 +128,7 @@ function shuffleDown() obj = board[index(column,row)]; if(obj == null) continue; - obj.x -= fallDist * gameCanvas.blockSize; + obj.x = (column-fallDist) * gameCanvas.blockSize; board[index(column-fallDist,row)] = obj; board[index(column,row)] = null; } |