diff options
| author | Starla Insigna <hatkirby@fourisland.com> | 2009-03-05 09:35:11 -0500 |
|---|---|---|
| committer | Starla Insigna <hatkirby@fourisland.com> | 2009-03-05 09:35:11 -0500 |
| commit | 82e91f3b85917f456214c121daa97ba65c7cce2a (patch) | |
| tree | f9003bcfdca9602ce2794babad9d8896d649297e /src/com/fourisland/fourpuzzle/gamestate/mapview/MapViewGameState.java | |
| parent | 284c53489b89a6e39027aeab27c258c8926f77f0 (diff) | |
| download | fourpuzzle-82e91f3b85917f456214c121daa97ba65c7cce2a.tar.gz fourpuzzle-82e91f3b85917f456214c121daa97ba65c7cce2a.tar.bz2 fourpuzzle-82e91f3b85917f456214c121daa97ba65c7cce2a.zip | |
Engine: Started Escape Menu
Refs #15
Diffstat (limited to 'src/com/fourisland/fourpuzzle/gamestate/mapview/MapViewGameState.java')
| -rwxr-xr-x | src/com/fourisland/fourpuzzle/gamestate/mapview/MapViewGameState.java | 15 |
1 files changed, 14 insertions, 1 deletions
| diff --git a/src/com/fourisland/fourpuzzle/gamestate/mapview/MapViewGameState.java b/src/com/fourisland/fourpuzzle/gamestate/mapview/MapViewGameState.java index ccb1829..7635839 100755 --- a/src/com/fourisland/fourpuzzle/gamestate/mapview/MapViewGameState.java +++ b/src/com/fourisland/fourpuzzle/gamestate/mapview/MapViewGameState.java | |||
| @@ -15,6 +15,7 @@ import com.fourisland.fourpuzzle.KeyInput; | |||
| 15 | import com.fourisland.fourpuzzle.Layer; | 15 | import com.fourisland.fourpuzzle.Layer; |
| 16 | import com.fourisland.fourpuzzle.PuzzleApplication; | 16 | import com.fourisland.fourpuzzle.PuzzleApplication; |
| 17 | import com.fourisland.fourpuzzle.database.Database; | 17 | import com.fourisland.fourpuzzle.database.Database; |
| 18 | import com.fourisland.fourpuzzle.database.Transitions; | ||
| 18 | import com.fourisland.fourpuzzle.gamestate.mapview.event.EventCallTime; | 19 | import com.fourisland.fourpuzzle.gamestate.mapview.event.EventCallTime; |
| 19 | import com.fourisland.fourpuzzle.gamestate.mapview.event.EventHandler; | 20 | import com.fourisland.fourpuzzle.gamestate.mapview.event.EventHandler; |
| 20 | import com.fourisland.fourpuzzle.gamestate.mapview.event.EventList; | 21 | import com.fourisland.fourpuzzle.gamestate.mapview.event.EventList; |
| @@ -23,10 +24,13 @@ import com.fourisland.fourpuzzle.gamestate.mapview.event.SpecialEvent; | |||
| 23 | import com.fourisland.fourpuzzle.gamestate.mapview.event.specialmove.MoveEventThread; | 24 | import com.fourisland.fourpuzzle.gamestate.mapview.event.specialmove.MoveEventThread; |
| 24 | import com.fourisland.fourpuzzle.gamestate.mapview.viewpoint.AutomaticViewpoint; | 25 | import com.fourisland.fourpuzzle.gamestate.mapview.viewpoint.AutomaticViewpoint; |
| 25 | import com.fourisland.fourpuzzle.gamestate.mapview.viewpoint.Viewpoint; | 26 | import com.fourisland.fourpuzzle.gamestate.mapview.viewpoint.Viewpoint; |
| 27 | import com.fourisland.fourpuzzle.gamestate.menu.MenuGameState; | ||
| 26 | import com.fourisland.fourpuzzle.util.Functions; | 28 | import com.fourisland.fourpuzzle.util.Functions; |
| 27 | import java.awt.Graphics2D; | 29 | import java.awt.Graphics2D; |
| 28 | import java.awt.event.KeyEvent; | 30 | import java.awt.event.KeyEvent; |
| 29 | import java.awt.image.BufferedImage; | 31 | import java.awt.image.BufferedImage; |
| 32 | import java.util.logging.Level; | ||
| 33 | import java.util.logging.Logger; | ||
| 30 | 34 | ||
| 31 | /** | 35 | /** |
| 32 | * | 36 | * |
| @@ -141,7 +145,16 @@ public class MapViewGameState implements GameState { | |||
| 141 | } | 145 | } |
| 142 | } | 146 | } |
| 143 | } | 147 | } |
| 144 | } | 148 | } |
| 149 | |||
| 150 | if (key.getKey() == KeyEvent.VK_ESCAPE) | ||
| 151 | { | ||
| 152 | try { | ||
| 153 | Display.transition(Database.getTransition(Transitions.Generic), new MenuGameState(this), true); | ||
| 154 | } catch (InterruptedException ex) { | ||
| 155 | Logger.getLogger(MapViewGameState.class.getName()).log(Level.SEVERE, null, ex); | ||
| 156 | } | ||
| 157 | } | ||
| 145 | } | 158 | } |
| 146 | 159 | ||
| 147 | if (EventHandler.isRunningEvent()) | 160 | if (EventHandler.isRunningEvent()) |
