Leahnaya/pokemon-showdown-client
1
0
Fork 0
mirror of https://github.com/smogon/pokemon-showdown-client.git synced 2026-05-09 04:23:01 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #494 from urkerab/switch-sides-sound

Browse Source 
Keep the sound playing when switching sides
This commit is contained in:
Guangcong Luo 2015-09-29 12:45:20 -05:00
commit 4e74aa3380
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
js/battle.js
View File

@ -5878,7 +5878,7 @@ var Battle = (function () {
}
this.soundPause();
};
Battle.prototype.play = function () {
Battle.prototype.play = function (dontResetSound) {
if (this.fastForward) {
this.paused = false;
this.playbackState = 5;
@ -5888,7 +5888,7 @@ var Battle = (function () {
this.soundStop();
}
this.playbackState = 2;
if (!this.done) {
if (!dontResetSound && !this.done) {
this.soundStart();
}
this.nextActivity();

4
js/client-battle.js
View File

@ -711,10 +711,10 @@
this.battle.fastForwardTo(-1);
} else {
var turn = this.battle.turn;
this.battle.reset();
this.battle.reset(true);
this.battle.switchSides();
if (turn) this.battle.fastForwardTo(turn);
this.battle.play();
this.battle.play(true);
}
},
instantReplay: function () {