diff options
author | Starla Insigna <hatkirby@fourisland.com> | 2009-02-08 21:11:06 -0500 |
---|---|---|
committer | Starla Insigna <hatkirby@fourisland.com> | 2009-02-08 21:11:06 -0500 |
commit | 58ed59720b88cd13c02b5103e8240ea3baa3eb43 (patch) | |
tree | 1f28928d97de81ff399a9082ab6c12a48ce9c643 | |
parent | 68b547a9de60342bb79e0223504ad115bcef90b0 (diff) | |
download | fourpuzzle-58ed59720b88cd13c02b5103e8240ea3baa3eb43.tar.gz fourpuzzle-58ed59720b88cd13c02b5103e8240ea3baa3eb43.tar.bz2 fourpuzzle-58ed59720b88cd13c02b5103e8240ea3baa3eb43.zip |
Added Decision2 sound
This sound should be played when the player selects something from the TitleScreen, opens the Menu and other choice sounding places.
-rwxr-xr-x | src/com/fourisland/fourpuzzle/gamestate/TitleScreenGameState.java | 2 | ||||
-rwxr-xr-x | src/com/fourisland/fourpuzzle/resources/sound/Decision2.wav | bin | 0 -> 21548 bytes | |||
-rwxr-xr-x | src/com/fourisland/fourpuzzle/window/ChoiceWindow.java | 2 |
3 files changed, 3 insertions, 1 deletions
diff --git a/src/com/fourisland/fourpuzzle/gamestate/TitleScreenGameState.java b/src/com/fourisland/fourpuzzle/gamestate/TitleScreenGameState.java index 998d33a..cf8b908 100755 --- a/src/com/fourisland/fourpuzzle/gamestate/TitleScreenGameState.java +++ b/src/com/fourisland/fourpuzzle/gamestate/TitleScreenGameState.java | |||
@@ -46,6 +46,8 @@ public class TitleScreenGameState implements GameState { | |||
46 | { | 46 | { |
47 | if (Game.getKey().getKeyCode() == KeyEvent.VK_ENTER) | 47 | if (Game.getKey().getKeyCode() == KeyEvent.VK_ENTER) |
48 | { | 48 | { |
49 | Audio.playSound("Decision2"); | ||
50 | |||
49 | if (choices.getSelected().equals(Database.getVocab("NewGame"))) | 51 | if (choices.getSelected().equals(Database.getVocab("NewGame"))) |
50 | { | 52 | { |
51 | Game.setSaveFile(new SaveFile()); | 53 | Game.setSaveFile(new SaveFile()); |
diff --git a/src/com/fourisland/fourpuzzle/resources/sound/Decision2.wav b/src/com/fourisland/fourpuzzle/resources/sound/Decision2.wav new file mode 100755 index 0000000..eed3449 --- /dev/null +++ b/src/com/fourisland/fourpuzzle/resources/sound/Decision2.wav | |||
Binary files differ | |||
diff --git a/src/com/fourisland/fourpuzzle/window/ChoiceWindow.java b/src/com/fourisland/fourpuzzle/window/ChoiceWindow.java index e466e63..9da5d60 100755 --- a/src/com/fourisland/fourpuzzle/window/ChoiceWindow.java +++ b/src/com/fourisland/fourpuzzle/window/ChoiceWindow.java | |||
@@ -81,7 +81,7 @@ public class ChoiceWindow { | |||
81 | g2.drawImage(SystemGraphic.getSelectionBackground(), tx-1, ty-fh+3, fw+SPACER-2, fh+SPACER-2, null); | 81 | g2.drawImage(SystemGraphic.getSelectionBackground(), tx-1, ty-fh+3, fw+SPACER-2, fh+SPACER-2, null); |
82 | g2.drawImage(Window.Selector.getImage(fw-Window.Selector.getLeftX(), fh-Window.Selector.getTopY()), tx-SPACER, ty-fh, null); | 82 | g2.drawImage(Window.Selector.getImage(fw-Window.Selector.getLeftX(), fh-Window.Selector.getTopY()), tx-SPACER, ty-fh, null); |
83 | } | 83 | } |
84 | 84 | ||
85 | g2.setPaint(new TexturePaint(SystemGraphic.getTextColor(), new Rectangle(tx, ty, fw, fh))); | 85 | g2.setPaint(new TexturePaint(SystemGraphic.getTextColor(), new Rectangle(tx, ty, fw, fh))); |
86 | g2.drawString(choice, tx, ty); | 86 | g2.drawString(choice, tx, ty); |
87 | 87 | ||