Skip to content

Commit

Permalink
Revert "Fixed music restart on setting music volume on"
Browse files Browse the repository at this point in the history
This reverts commit 563c62c.
  • Loading branch information
nop90 committed Jun 2, 2016
1 parent 563c62c commit c7aec67
Showing 1 changed file with 2 additions and 3 deletions.
5 changes: 2 additions & 3 deletions src/Keyboard.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -551,10 +551,9 @@ int Keyboard::pollKeys(int keys) {
gpJeu->getAudio()->playSound(3);}}
if ((keys&SDLK_RIGHT) && !tmp) {
if (ligneOption == 0) {
int tempvol = volume;
if (volume==0) gpJeu->getAudio()->playMusic(47);
volume+=64; if (volume > 64) volume = 64; tmp=1;
gpJeu->getAudio()->setVolume(volume);gpJeu->getAudio()->playSound(3);
if (tempvol==0) gpJeu->getAudio()->playMusic(46);}
gpJeu->getAudio()->setVolume(volume);gpJeu->getAudio()->playSound(3);}
if (ligneOption == 1) {
volson+=64; if (volson > 64) volson = 64; tmp=1;
gpJeu->getAudio()->setVolson(volson);gpJeu->getAudio()->playSound(3);}
Expand Down

0 comments on commit c7aec67

Please sign in to comment.