diff options
author | Starla Insigna <hatkirby@fourisland.com> | 2009-02-10 18:32:04 -0500 |
---|---|---|
committer | Starla Insigna <hatkirby@fourisland.com> | 2009-02-10 18:32:04 -0500 |
commit | 41ce65d9ae3e75cd374b6f5f99486ee057194a06 (patch) | |
tree | af1ba68caa97a80b19271e4668ba4f423114add6 /src/com/fourisland/fourpuzzle/gamestate/mapview/MapViewGameState.java | |
parent | 7fbf2187cf557f75c3f63ba36d2563592b066536 (diff) | |
download | fourpuzzle-41ce65d9ae3e75cd374b6f5f99486ee057194a06.tar.gz fourpuzzle-41ce65d9ae3e75cd374b6f5f99486ee057194a06.tar.bz2 fourpuzzle-41ce65d9ae3e75cd374b6f5f99486ee057194a06.zip |
Engine: Added some control to Music
MapViewGameState now plays music depending on the variables of its Map, which can tell it to either stop the music, keep the previous music playing or start playing a specified music.
Diffstat (limited to 'src/com/fourisland/fourpuzzle/gamestate/mapview/MapViewGameState.java')
-rwxr-xr-x | src/com/fourisland/fourpuzzle/gamestate/mapview/MapViewGameState.java | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/src/com/fourisland/fourpuzzle/gamestate/mapview/MapViewGameState.java b/src/com/fourisland/fourpuzzle/gamestate/mapview/MapViewGameState.java index 9924c9e..52a56c4 100755 --- a/src/com/fourisland/fourpuzzle/gamestate/mapview/MapViewGameState.java +++ b/src/com/fourisland/fourpuzzle/gamestate/mapview/MapViewGameState.java | |||
@@ -50,18 +50,17 @@ public class MapViewGameState implements GameState { | |||
50 | 50 | ||
51 | public void initalize() | 51 | public void initalize() |
52 | { | 52 | { |
53 | //if (!currentMap.getMusic().equals("")) | 53 | switch (currentMap.getMusicType()) |
54 | { | 54 | { |
55 | // Audio.playMusic(currentMap.getMusic()); | 55 | case NoMusic: Audio.stopMusic(); break; |
56 | case NoChange: break; | ||
57 | case Specified: Audio.playMusic(currentMap.getMusic()); break; | ||
56 | } | 58 | } |
57 | } | 59 | } |
58 | 60 | ||
59 | public void deinitalize() | 61 | public void deinitalize() |
60 | { | 62 | { |
61 | //if (!currentMap.getMusic().equals("")) | 63 | // Do nothing, yet |
62 | { | ||
63 | Audio.stopMusic(); | ||
64 | } | ||
65 | } | 64 | } |
66 | 65 | ||
67 | public void processInput() | 66 | public void processInput() |