commit aceba8db

sago007 · 2012-04-19 20:27
aceba8db23cc0c236db90ff7d92861d9ea25a5ef patch · browse files
parent 42f054343157bbd9f86af4d6acc23b51d82ab023

Removed a cout in LevelSelect and corrected init text on the Sound-button


git-svn-id: https://blockattack.svn.sourceforge.net/svnroot/blockattack/trunk@138 9d7177f8-192b-0410-8f35-a16a89829b06

Changed files

M	source/code/main.cpp before
M	source/code/menudef.cpp before

diff --git a/source/code/main.cpp b/source/code/main.cpp index 90b4b0c..12ec28d 100644 --- a/source/code/main.cpp +++ b/source/code/main.cpp

@@ -2785,7 +2785,6 @@ int PuzzleLevelSelect(int Type)

for (j = 0; (tmpSelected == -1) && ( (j<nrOfLevels/10)||((j<nrOfLevels/10+1)&&(nrOfLevels%10 != 0)) ); j++)

if ((60+j*50<mousey-yplace)&&(mousey-yplace<j*50+92))

tmpSelected = j*10;

- cout << j << endl;

if (tmpSelected != -1)

for (int k = 0; (( (!(nrOfLevels%10) || k<nrOfLevels-10*(j-1)) )&&(k<10)); k++)

if ((10+k*50<mousex-xplace)&&(mousex-xplace<k*50+42))

diff --git a/source/code/menudef.cpp b/source/code/menudef.cpp index 7c572b9..d06e94e 100644 --- a/source/code/menudef.cpp +++ b/source/code/menudef.cpp

@@ -200,7 +200,7 @@ void ConfigureMenu(Button *b)

Button bPlayer1Keys, bPlayer2Keys;

bMusic.setLabel(MusicEnabled? _("Music: On") : _("Music: Off") );

bMusic.setAction(buttonActionMusic);

- bSound.setLabel(SoundEnabled? _("Music: On") : _("Music: Off") );

+ bSound.setLabel(SoundEnabled? _("Sound: On") : _("Sound: Off") );

bSound.setAction(buttonActionSound);

buttonFullscreen.setLabel(bFullscreen? _("Fullscreen: On") : _("Fullscreen: Off") );

buttonFullscreen.setAction(buttonActionFullscreen);