diff options
| author | Starla Insigna <hatkirby@fourisland.com> | 2009-02-22 17:11:32 -0500 |
|---|---|---|
| committer | Starla Insigna <hatkirby@fourisland.com> | 2009-02-22 17:11:32 -0500 |
| commit | 8b8e44782659c65b9899f81a1ad5e09477c37354 (patch) | |
| tree | 9e56324051e916997593e54ce0b6fd5f7aae5001 /src/com/fourisland/fourpuzzle/gamestate/mapview/event | |
| parent | 006e76d24c1d6ea465fef2a5958133b712a7ca3d (diff) | |
| download | fourpuzzle-8b8e44782659c65b9899f81a1ad5e09477c37354.tar.gz fourpuzzle-8b8e44782659c65b9899f81a1ad5e09477c37354.tar.bz2 fourpuzzle-8b8e44782659c65b9899f81a1ad5e09477c37354.zip | |
Engine: Rewrote Database Transition storage
Diffstat (limited to 'src/com/fourisland/fourpuzzle/gamestate/mapview/event')
| -rwxr-xr-x | src/com/fourisland/fourpuzzle/gamestate/mapview/event/SpecialEvent.java | 6 |
1 files changed, 3 insertions, 3 deletions
| diff --git a/src/com/fourisland/fourpuzzle/gamestate/mapview/event/SpecialEvent.java b/src/com/fourisland/fourpuzzle/gamestate/mapview/event/SpecialEvent.java index ebb0e27..c3bec32 100755 --- a/src/com/fourisland/fourpuzzle/gamestate/mapview/event/SpecialEvent.java +++ b/src/com/fourisland/fourpuzzle/gamestate/mapview/event/SpecialEvent.java | |||
| @@ -157,7 +157,7 @@ public class SpecialEvent { | |||
| 157 | { | 157 | { |
| 158 | Audio.stopMusic(); | 158 | Audio.stopMusic(); |
| 159 | 159 | ||
| 160 | Display.transition(Database.getTransition(Transitions.MapToGameOver), new GameOverGameState(), Database.getTransition(Transitions.GameOverEnter), false); | 160 | Display.transition(Database.getTransition(Transitions.Generic), new GameOverGameState(), false); |
| 161 | } | 161 | } |
| 162 | 162 | ||
| 163 | /** | 163 | /** |
| @@ -169,7 +169,7 @@ public class SpecialEvent { | |||
| 169 | { | 169 | { |
| 170 | Audio.stopMusic(); | 170 | Audio.stopMusic(); |
| 171 | 171 | ||
| 172 | Display.transition(Database.getTransition(Transitions.MapToTitle), new TitleScreenGameState(), Database.getTransition(Transitions.TitleEnter), false); | 172 | Display.transition(Database.getTransition(Transitions.Generic), new TitleScreenGameState(), false); |
| 173 | } | 173 | } |
| 174 | 174 | ||
| 175 | private boolean startedTransition = false; | 175 | private boolean startedTransition = false; |
| @@ -211,7 +211,7 @@ public class SpecialEvent { | |||
| 211 | { | 211 | { |
| 212 | if (!startedTransition) | 212 | if (!startedTransition) |
| 213 | { | 213 | { |
| 214 | Display.transition(Database.getTransition(Transitions.MapExit), new MapViewGameState(map, x, y), Database.getTransition(Transitions.MapEnter), false); | 214 | Display.transition(Database.getTransition(Transitions.Map), new MapViewGameState(map, x, y), false); |
| 215 | } else { | 215 | } else { |
| 216 | Game.setGameState(new MapViewGameState(map, x, y)); | 216 | Game.setGameState(new MapViewGameState(map, x, y)); |
| 217 | } | 217 | } |