diff options
author | Starla Insigna <hatkirby@fourisland.com> | 2009-02-03 21:11:23 -0500 |
---|---|---|
committer | Starla Insigna <hatkirby@fourisland.com> | 2009-02-03 21:11:23 -0500 |
commit | 029190712a8f38cef760741cf53652e0ccd89172 (patch) | |
tree | bf1a01b9103592f4dda7511e9b23913bbbd98870 /src/com/fourisland/fourpuzzle/PuzzleApplication.java | |
parent | ce6ae1b56e4f6548dc19974474c8ee2d8cece13a (diff) | |
download | fourpuzzle-029190712a8f38cef760741cf53652e0ccd89172.tar.gz fourpuzzle-029190712a8f38cef760741cf53652e0ccd89172.tar.bz2 fourpuzzle-029190712a8f38cef760741cf53652e0ccd89172.zip |
Started working on new Transitions
The old transition implementation was old and patchy. The new one is planned to be extensible and to work properly with all transitions. Currently this is not so, but with work it hopefully will be.
Diffstat (limited to 'src/com/fourisland/fourpuzzle/PuzzleApplication.java')
-rw-r--r-- | src/com/fourisland/fourpuzzle/PuzzleApplication.java | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/src/com/fourisland/fourpuzzle/PuzzleApplication.java b/src/com/fourisland/fourpuzzle/PuzzleApplication.java index 1c1dde2..9225c90 100644 --- a/src/com/fourisland/fourpuzzle/PuzzleApplication.java +++ b/src/com/fourisland/fourpuzzle/PuzzleApplication.java | |||
@@ -117,12 +117,16 @@ public class PuzzleApplication extends Application { | |||
117 | 117 | ||
118 | if ((iTickCount > iTickTrigger) && (!gameSleep)) | 118 | if ((iTickCount > iTickTrigger) && (!gameSleep)) |
119 | { | 119 | { |
120 | if (Game.getKey() != null) | 120 | if (!Display.isTransitionRunning()) |
121 | { | 121 | { |
122 | Game.getGameState().processInput(); | 122 | if (Game.getKey() != null) |
123 | { | ||
124 | Game.getGameState().processInput(); | ||
125 | } | ||
126 | |||
127 | Game.getGameState().doGameCycle(); | ||
123 | } | 128 | } |
124 | 129 | ||
125 | Game.getGameState().doGameCycle(); | ||
126 | Display.render(gameFrame); | 130 | Display.render(gameFrame); |
127 | 131 | ||
128 | if (!debugSpeed) | 132 | if (!debugSpeed) |