summary refs log tree commit diff stats
path: root/src/com/fourisland/fourpuzzle/gamestate/mapview/MapViewGameState.java
diff options
context:
space:
mode:
authorStarla Insigna <hatkirby@fourisland.com>2009-03-05 09:35:11 -0500
committerStarla Insigna <hatkirby@fourisland.com>2009-03-05 09:35:11 -0500
commit82e91f3b85917f456214c121daa97ba65c7cce2a (patch)
treef9003bcfdca9602ce2794babad9d8896d649297e /src/com/fourisland/fourpuzzle/gamestate/mapview/MapViewGameState.java
parent284c53489b89a6e39027aeab27c258c8926f77f0 (diff)
downloadfourpuzzle-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-xsrc/com/fourisland/fourpuzzle/gamestate/mapview/MapViewGameState.java15
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;
15import com.fourisland.fourpuzzle.Layer; 15import com.fourisland.fourpuzzle.Layer;
16import com.fourisland.fourpuzzle.PuzzleApplication; 16import com.fourisland.fourpuzzle.PuzzleApplication;
17import com.fourisland.fourpuzzle.database.Database; 17import com.fourisland.fourpuzzle.database.Database;
18import com.fourisland.fourpuzzle.database.Transitions;
18import com.fourisland.fourpuzzle.gamestate.mapview.event.EventCallTime; 19import com.fourisland.fourpuzzle.gamestate.mapview.event.EventCallTime;
19import com.fourisland.fourpuzzle.gamestate.mapview.event.EventHandler; 20import com.fourisland.fourpuzzle.gamestate.mapview.event.EventHandler;
20import com.fourisland.fourpuzzle.gamestate.mapview.event.EventList; 21import com.fourisland.fourpuzzle.gamestate.mapview.event.EventList;
@@ -23,10 +24,13 @@ import com.fourisland.fourpuzzle.gamestate.mapview.event.SpecialEvent;
23import com.fourisland.fourpuzzle.gamestate.mapview.event.specialmove.MoveEventThread; 24import com.fourisland.fourpuzzle.gamestate.mapview.event.specialmove.MoveEventThread;
24import com.fourisland.fourpuzzle.gamestate.mapview.viewpoint.AutomaticViewpoint; 25import com.fourisland.fourpuzzle.gamestate.mapview.viewpoint.AutomaticViewpoint;
25import com.fourisland.fourpuzzle.gamestate.mapview.viewpoint.Viewpoint; 26import com.fourisland.fourpuzzle.gamestate.mapview.viewpoint.Viewpoint;
27import com.fourisland.fourpuzzle.gamestate.menu.MenuGameState;
26import com.fourisland.fourpuzzle.util.Functions; 28import com.fourisland.fourpuzzle.util.Functions;
27import java.awt.Graphics2D; 29import java.awt.Graphics2D;
28import java.awt.event.KeyEvent; 30import java.awt.event.KeyEvent;
29import java.awt.image.BufferedImage; 31import java.awt.image.BufferedImage;
32import java.util.logging.Level;
33import 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())