summary refs log tree commit diff stats
path: root/src/com/fourisland/fourpuzzle/gamestate/mapview/event/SpecialEvent.java
diff options
context:
space:
mode:
authorStarla Insigna <hatkirby@fourisland.com>2009-02-09 16:05:58 -0500
committerStarla Insigna <hatkirby@fourisland.com>2009-02-09 16:05:58 -0500
commitb384ef4a400bd8d830822a73ac99627d9a5e5fc7 (patch)
treebab7c9e7716964dce825dc3a1e77bc85b246026c /src/com/fourisland/fourpuzzle/gamestate/mapview/event/SpecialEvent.java
parent58ed59720b88cd13c02b5103e8240ea3baa3eb43 (diff)
downloadfourpuzzle-b384ef4a400bd8d830822a73ac99627d9a5e5fc7.tar.gz
fourpuzzle-b384ef4a400bd8d830822a73ac99627d9a5e5fc7.tar.bz2
fourpuzzle-b384ef4a400bd8d830822a73ac99627d9a5e5fc7.zip
Re-implemented Database
See #8
Diffstat (limited to 'src/com/fourisland/fourpuzzle/gamestate/mapview/event/SpecialEvent.java')
-rwxr-xr-xsrc/com/fourisland/fourpuzzle/gamestate/mapview/event/SpecialEvent.java6
1 files changed, 4 insertions, 2 deletions
diff --git a/src/com/fourisland/fourpuzzle/gamestate/mapview/event/SpecialEvent.java b/src/com/fourisland/fourpuzzle/gamestate/mapview/event/SpecialEvent.java index 5bd312a..22e464d 100755 --- a/src/com/fourisland/fourpuzzle/gamestate/mapview/event/SpecialEvent.java +++ b/src/com/fourisland/fourpuzzle/gamestate/mapview/event/SpecialEvent.java
@@ -5,7 +5,9 @@
5 5
6package com.fourisland.fourpuzzle.gamestate.mapview.event; 6package com.fourisland.fourpuzzle.gamestate.mapview.event;
7 7
8import com.fourisland.fourpuzzle.database.Database;
8import com.fourisland.fourpuzzle.*; 9import com.fourisland.fourpuzzle.*;
10import com.fourisland.fourpuzzle.database.Transitions;
9import com.fourisland.fourpuzzle.gamestate.mapview.MapViewGameState; 11import com.fourisland.fourpuzzle.gamestate.mapview.MapViewGameState;
10import com.fourisland.fourpuzzle.gamestate.mapview.event.specialmove.MoveEvent; 12import com.fourisland.fourpuzzle.gamestate.mapview.event.specialmove.MoveEvent;
11import com.fourisland.fourpuzzle.gamestate.mapview.event.specialmove.MoveEventThread; 13import com.fourisland.fourpuzzle.gamestate.mapview.event.specialmove.MoveEventThread;
@@ -190,14 +192,14 @@ public class SpecialEvent {
190 { 192 {
191 if (!startedTransition) 193 if (!startedTransition)
192 { 194 {
193 Display.transition(Database.getTransition("MapExit")); 195 Display.transition(Database.getTransition(Transitions.MapExit));
194 } 196 }
195 197
196 Game.setGameState(new MapViewGameState(map, x, y)); 198 Game.setGameState(new MapViewGameState(map, x, y));
197 199
198 if (!startedTransition) 200 if (!startedTransition)
199 { 201 {
200 Display.transition(Database.getTransition("MapEnter")); 202 Display.transition(Database.getTransition(Transitions.MapEnter));
201 } 203 }
202 } 204 }
203 205