add bullet_hit_2 sound

korgx9 · Jun 24, 2012 · a98e961 · a98e961
1 parent 6ac5716
commit a98e961
Show file tree

Hide file tree

Showing 6 changed files with 13 additions and 8 deletions.
diff --git a/sound/bullet_hit_2.ogg b/sound/bullet_hit_2.ogg
diff --git a/spec/PauseSpec.js b/spec/PauseSpec.js
@@ -11,8 +11,8 @@ describe("Pause", function () {
       var eventManager = new EventManager();
       var pause = new Pause(eventManager);
       spyOn(pause, 'keyPressed');
-      pause.notify({'name': Keyboard.Event.KEY_PRESSED, 'key': Keyboard.Key.P});
-      expect(pause.keyPressed).toHaveBeenCalledWith(Keyboard.Key.P);
+      pause.notify({'name': Keyboard.Event.KEY_PRESSED, 'key': Keyboard.Key.START});
+      expect(pause.keyPressed).toHaveBeenCalledWith(Keyboard.Key.START);
     });
   });
 
@@ -21,10 +21,10 @@ describe("Pause", function () {
     spyOn(eventManager, 'fireEvent');
     var pause = new Pause(eventManager);
 
-    pause.keyPressed(Keyboard.Key.P);
+    pause.keyPressed(Keyboard.Key.START);
     expect(eventManager.fireEvent).toHaveBeenCalledWith({'name': Pause.Event.START});
 
-    pause.keyPressed(Keyboard.Key.P);
+    pause.keyPressed(Keyboard.Key.START);
     expect(eventManager.fireEvent).toHaveBeenCalledWith({'name': Pause.Event.END});
   });
 });
diff --git a/src/Bullet.js b/src/Bullet.js
@@ -30,8 +30,13 @@ Bullet.prototype.notify = function (event) {
     this.destroy();
   }
   else if (this._wallCollision(event)) {
-    if (this._tank.isPlayer() && event.sprite instanceof SteelWall) {
-      SoundManager.play("bullet_hit_1");
+    if (this._tank.isPlayer()) {
+      if (event.sprite instanceof SteelWall) {
+        SoundManager.play("bullet_hit_1");
+      }
+      else if (event.sprite instanceof BrickWall) {
+        SoundManager.play("bullet_hit_2");
+      }
     }
     this.destroy();
   }

diff --git a/src/Keyboard.js b/src/Keyboard.js
@@ -11,7 +11,6 @@ Keyboard.Key.LEFT = 37;
 Keyboard.Key.UP = 38;
 Keyboard.Key.RIGHT = 39;
 Keyboard.Key.DOWN = 40;
-Keyboard.Key.P = 80;
 Keyboard.Key.S = 83;
 Keyboard.Key.SELECT = 17;
 Keyboard.Key.START = 13;

diff --git a/src/Pause.js b/src/Pause.js
@@ -20,7 +20,7 @@ Pause.prototype.keyPressed = function (key) {
   if (!this._active) {
     return;
   }
-  if (key == Keyboard.Key.P) {
+  if (key == Keyboard.Key.START) {
     this._pause = !this._pause;
 
     if (this._pause) {

diff --git a/src/SoundManager.js b/src/SoundManager.js
@@ -4,6 +4,7 @@ var SoundManager = (function() {
     game_over: null,
     bullet_shot: null,
     bullet_hit_1: null,
+    bullet_hit_2: null,
     explosion_1: null,
     explosion_2: null,
     pause: null,