The volume given in Sound.play now over-rides that set in Sound.addMarker if specified (fix phaserjs#623)

Author: photonstorm

README.md

@@ -93,6 +93,7 @@ Bug Fixes
 * If no seed was given in the Game config object, the RandomDataGenerator wouldn't be started (thank tylerjhutchison fix #619)
 * p2 revolute pivots were wrongly signed (thanks georgiee, fix #621)
 * P2.Body.loadPolygon no longer modifies the Cache array (fix #613)
+* The volume given in Sound.play now over-rides that set in Sound.addMarker if specified (fix #623)
 
 
 Updated

src/sound/Sound.js

@@ -296,7 +296,7 @@ Phaser.Sound.prototype = {
     */
     addMarker: function (name, start, duration, volume, loop) {
 
-        volume = volume || 1;
+        if (typeof volume == 'undefined') { volume = 1; }
         if (typeof loop == 'undefined') { loop = false; }
 
         this.markers[name] = {
@@ -397,15 +397,9 @@ Phaser.Sound.prototype = {
     */
     play: function (marker, position, volume, loop, forceRestart) {
 
-        marker = marker || '';
-        position = position || 0;
-
-        if (typeof volume === 'undefined') { volume = this._volume; }
-        if (typeof loop === 'undefined') { loop = this.loop; }
+        if (typeof marker === 'undefined') { marker = ''; }
         if (typeof forceRestart === 'undefined') { forceRestart = true; }
 
-        // console.log(this.name + ' play ' + marker + ' position ' + position + ' volume ' + volume + ' loop ' + loop, 'force', forceRestart);
-
         if (this.isPlaying === true && forceRestart === false && this.override === false)
         {
             //  Use Restart instead
@@ -414,8 +408,6 @@ Phaser.Sound.prototype = {
 
         if (this.isPlaying && this.override)
         {
-            // console.log('asked to play ' + marker + ' but already playing ' + this.currentMarker);
-        
             if (this.usingWebAudio)
             {
                 if (typeof this._sound.stop === 'undefined')
@@ -440,13 +432,22 @@ Phaser.Sound.prototype = {
         {
             if (this.markers[marker])
             {
+                //  Playing a marker? Then we default to the marker values
                 this.position = this.markers[marker].start;
                 this.volume = this.markers[marker].volume;
                 this.loop = this.markers[marker].loop;
                 this.duration = this.markers[marker].duration;
                 this.durationMS = this.markers[marker].durationMS;
 
-                // console.log('Marker Loaded: ', marker, 'start:', this.position, 'end: ', this.duration, 'loop', this.loop);
+                if (typeof volume !== 'undefined')
+                {
+                    this.volume = volume;
+                }
+
+                if (typeof loop !== 'undefined')
+                {
+                    this.loop = loop;
+                }
 
                 this._tempMarker = marker;
                 this._tempPosition = this.position;
@@ -461,7 +462,10 @@ Phaser.Sound.prototype = {
         }
         else
         {
-            // console.log('no marker info loaded', marker);
+            position = position || 0;
+
+            if (typeof volume === 'undefined') { volume = this._volume; }
+            if (typeof loop === 'undefined') { loop = this.loop; }
 
             this.position = position;
             this.volume = volume;