From 45426be0bc2458b9aaff3b896c78e2066ed37a52 Mon Sep 17 00:00:00 2001
From: Richard Davey <rdavey@gmail.com>
Date: Fri, 20 Sep 2013 23:21:12 +0100
Subject: [PATCH] Assets update

---
 examples/assets/games/breakout/ball.png   | Bin 0 -> 190 bytes
 examples/assets/games/breakout/brick0.png | Bin 0 -> 160 bytes
 examples/assets/games/breakout/brick1.png | Bin 0 -> 160 bytes
 examples/assets/games/breakout/brick2.png | Bin 0 -> 171 bytes
 examples/assets/games/breakout/brick3.png | Bin 0 -> 162 bytes
 examples/assets/games/breakout/brick4.png | Bin 0 -> 162 bytes
 examples/assets/games/breakout/brick5.png | Bin 0 -> 167 bytes
 examples/assets/games/breakout/paddle.png | Bin 0 -> 446 bytes
 src/input/InputHandler.js                 |   4 ++--
 src/sound/Sound.js                        |   6 ++----
 10 files changed, 4 insertions(+), 6 deletions(-)
 create mode 100644 examples/assets/games/breakout/ball.png
 create mode 100644 examples/assets/games/breakout/brick0.png
 create mode 100644 examples/assets/games/breakout/brick1.png
 create mode 100644 examples/assets/games/breakout/brick2.png
 create mode 100644 examples/assets/games/breakout/brick3.png
 create mode 100644 examples/assets/games/breakout/brick4.png
 create mode 100644 examples/assets/games/breakout/brick5.png
 create mode 100644 examples/assets/games/breakout/paddle.png

diff --git a/examples/assets/games/breakout/ball.png b/examples/assets/games/breakout/ball.png
new file mode 100644
index 0000000000000000000000000000000000000000..aa46e78b791c831276f40015ee9a412a4b97f1d8
GIT binary patch
literal 190
zcmeAS@N?(olHy`uVBq!ia0vp^JRr=$1|-8uW1a&k$r9IylHmNblJdl&R0hYC{G?O`
z&)mfH)S%SFl*+=BsWw1G37#&FAr-fh{`{ZM$Ri;sxj^R)!-_t^HGLtxItHzgl~WTq
zcYiPtX>AW%*Ccg=FYNdc2PK9`=4(42y{O#auwyD?SJTwvdJQi*vYpvB<t*6CCidlm
l1N)0dOWK9bCQB(CV7M)%CVb;XQYz3c22WQ%mvv4FO#qfYLVy4O

literal 0
HcmV?d00001

diff --git a/examples/assets/games/breakout/brick0.png b/examples/assets/games/breakout/brick0.png
new file mode 100644
index 0000000000000000000000000000000000000000..53949a4ab9eaaae20ee260e775da857ff21608b8
GIT binary patch
literal 160
zcmeAS@N?(olHy`uVBq!ia0vp^3P3Et!2~3KB)#GTQj#UE5hcO-X(i=}MX3yqDfvmM
z3ZA)%>8U}fi7AzZCsS>Jikv)M978H@B_&9_Y7lh#`~Uy^uC{ahuh=JfzV2>N5nfw+
zpebkhwnC$;x(jylyXi`7ZOHn`z_f1OT<b42245H*8W<UB?{Ur1i+}YUXc~j3tDnm{
Hr-UW|JM%aY

literal 0
HcmV?d00001

diff --git a/examples/assets/games/breakout/brick1.png b/examples/assets/games/breakout/brick1.png
new file mode 100644
index 0000000000000000000000000000000000000000..33adc12c1735f03aacfcd055501c45af8d5189a6
GIT binary patch
literal 160
zcmeAS@N?(olHy`uVBq!ia0vp^3P3Et!2~3KB)#GTQj#UE5hcO-X(i=}MX3yqDfvmM
z3ZA)%>8U}fi7AzZCsS>Jikv)M978H@B_&9_Y7lh#`~Uy^t~R?lC)iX(x$2lb)uMhk
zu-^2me9W;b+M!s!C(0m;@#-f=6Z1K-hF@w7zA!p8FfxcN<eG9UFBaqm22WQ%mvv4F
FO#pE?Giv|<

literal 0
HcmV?d00001

diff --git a/examples/assets/games/breakout/brick2.png b/examples/assets/games/breakout/brick2.png
new file mode 100644
index 0000000000000000000000000000000000000000..3f03babde02721e5634146d81ceb13bf5d899561
GIT binary patch
literal 171
zcmeAS@N?(olHy`uVBq!ia0vp^3P3Et!2~3KB)#GTQj#UE5hcO-X(i=}MX3yqDfvmM
z3ZA)%>8U}fi7AzZCsS>JihMm?978H@B_&9_Y7lh#`~SbZN8Np+ZmqVu`BuUnT<<N|
zRc2<qWftT3dhW7>2bbio;N$EbIkSEzTxkmAUNMb-!On+&&Mkc2ypW%PiHAY3o3HkO
S)%Gr+!3>_RelF{r5}E)ofI43Q

literal 0
HcmV?d00001

diff --git a/examples/assets/games/breakout/brick3.png b/examples/assets/games/breakout/brick3.png
new file mode 100644
index 0000000000000000000000000000000000000000..15a66c7684cb9616d460a9a07a1b15e1300e4fa9
GIT binary patch
literal 162
zcmeAS@N?(olHy`uVBq!ia0vp^3P3Et!2~3KB)#GTQj#UE5hcO-X(i=}MX3yqDfvmM
z3ZA)%>8U}fi7AzZCsS>Jid;Nh978H@B_&9_Y7lh#`~Uy^t~R|{7kN}38^3N)5nfw+
zpeg5hWxLBNiL8zz%Xad+=}K&E$ok1JtB(JSe3hNVF9wAJ3?*FLTpfEd=K#%P@O1Ta
JS?83{1OSDmHxU2;

literal 0
HcmV?d00001

diff --git a/examples/assets/games/breakout/brick4.png b/examples/assets/games/breakout/brick4.png
new file mode 100644
index 0000000000000000000000000000000000000000..5f50f1c43b99e9c5094544698a162848791fc2f3
GIT binary patch
literal 162
zcmeAS@N?(olHy`uVBq!ia0vp^3P3Et!2~3KB)#GTQj#UE5hcO-X(i=}MX3yqDfvmM
z3ZA)%>8U}fi7AzZCsS>Jid;Nh978H@B_&9_Y7lh#`~Uy^t~S3}OPN(ZUtZ7TsTTFS
zf%T@J;otZWqiMY77VYGB)0NoTkoA*+DK0iey2?)C7lXn9hWLkERpHe)Qi0|%c)I$z
JtaD0e0sv6(Hc<co

literal 0
HcmV?d00001

diff --git a/examples/assets/games/breakout/brick5.png b/examples/assets/games/breakout/brick5.png
new file mode 100644
index 0000000000000000000000000000000000000000..771193f41ec8e85043a495298d5a289ac996ea03
GIT binary patch
literal 167
zcmeAS@N?(olHy`uVBq!ia0vp^3P3Et!2~3KB)#GTQj#UE5hcO-X(i=}MX3yqDfvmM
z3ZA)%>8U}fi7AzZCsS>Jiab4C978H@B_&9_Y7lh#`~SbZ$Fs`SK}Roa)^}VcYh5kw
zVRZ2pyN<xATQ015>Q4`xijX|FY$v~)uEf@cte*_VfB7Wkd1@I15*S`h;I-#|=aCOI
Ol)=;0&t;ucLK6U5em7eH

literal 0
HcmV?d00001

diff --git a/examples/assets/games/breakout/paddle.png b/examples/assets/games/breakout/paddle.png
new file mode 100644
index 0000000000000000000000000000000000000000..b99502e2f39b4a623e6a4051d78addd36f35c641
GIT binary patch
literal 446
zcmV;v0YUzWP)<h;3K|Lk000e1NJLTq002Ay000mO1^@s6N|GEu0000PbVXQnQ*UN;
zcVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBUzU`a$lRCwBA{QsW;3>X<1pe*bFsE(0g
z5CdY}&%`jo01GT+a=lc*0uBH8z_gH|J0#@V+ldOn!2<qQR)Xnw=XXN<!}JO2{yYCi
zWDJASHQ48GJ&eEtC%!)c)2&~4!Su1Scfs_+=}lmoUC$TAfI}-+foZ$&Fq%3Pmpwl(
zZ3ffvnRQ^=%2*jpSMz)Z(-xdEU|M*`Ifjv$hhYr#m_0hd3MvDk^V%1I=}8&2SVI^_
z!$2IGI#R)+8O<nsb4^Y#9d2cSBA(Y83dy^NV^PGd3ywizn&AnG_{fc6Lg4I6?1eOX
zOrpmOrGQXM!R0PoVC2T|4sJ;O%kTvfVvM$nQ53>TzdUbMtOos6f#jtNM<J!@naztR
zau_V;PG0{GrkU@o#$Vmwa4+0n46jCJ48!YTScn*lLz>JUUm-0N?}M*~l!vz3i=o6U
oETzEO6C*E%M|(@d8~_9u0P?1K&R1s-ga7~l07*qoM6N<$g7RR%FaQ7m

literal 0
HcmV?d00001

diff --git a/src/input/InputHandler.js b/src/input/InputHandler.js
index 41be1595..66dafd98 100644
--- a/src/input/InputHandler.js
+++ b/src/input/InputHandler.js
@@ -755,8 +755,8 @@ Phaser.InputHandler.prototype = {
     */
     setDragLock: function (allowHorizontal, allowVertical) {
 
-    	allowHorizontal = allowHorizontal || true;
-    	allowVertical = allowVertical || true;
+        if (typeof allowHorizontal == 'undefined') { allowHorizontal = true; }
+    	if (typeof allowVertical == 'undefined') { allowVertical = true; }
 
         this.allowHorizontalDrag = allowHorizontal;
         this.allowVerticalDrag = allowVertical;
diff --git a/src/sound/Sound.js b/src/sound/Sound.js
index d45543f7..a7bf61e0 100644
--- a/src/sound/Sound.js
+++ b/src/sound/Sound.js
@@ -27,7 +27,7 @@ Phaser.Sound = function (game, key, volume, loop) {
     * @public
     * @type {string}
     */
-    this.name = '';
+    this.name = key;
 
     /**
     * Asset key for the sound.
@@ -266,9 +266,7 @@ Phaser.Sound.prototype = {
     	if (typeof loop == 'undefined') { loop = false; }
     	if (typeof forceRestart == 'undefined') { forceRestart = false; }
 
-
-
-        console.log('play ' + marker + ' position ' + position + ' volume ' + volume + ' loop ' + loop);
+        console.log(this.name + ' play ' + marker + ' position ' + position + ' volume ' + volume + ' loop ' + loop);
 
         if (this.isPlaying == true && forceRestart == false && this.override == false)
         {