Ticket #8604: sky-control2.patch

engines/sky/control.h

@@ -203 +203 @@
         uint16 handleClick(ConResource *pButton);
         uint16 doMusicSlide(void);
         uint16 doSpeedSlide(void);
-        uint16 toggleFx(ConResource *pButton);
+        void toggleFx(ConResource *pButton);
         uint16 toggleText(void);
-        void toggleMusic(void);
+        void toggleMusic(ConResource *pButton);
         uint16 shiftDown(uint8 speed);
         uint16 shiftUp(uint8 speed);
         void drawTextCross(uint32 flags);

engines/sky/sky.cpp

@@ -357 +357 @@
         if (ConfMan.getBool("sfx_mute")) {
                 SkyEngine::_systemVars.systemFlags |= SF_FX_OFF;
         }
+        if (ConfMan.getBool("music_mute")) {
+                SkyEngine::_systemVars.systemFlags |= SF_MUS_OFF;
+        }
          _mixer->setVolumeForSoundType(Audio::Mixer::kSFXSoundType, ConfMan.getInt("sfx_volume"));
          _mixer->setVolumeForSoundType(Audio::Mixer::kMusicSoundType, ConfMan.getInt("music_volume"));
         _floppyIntro = ConfMan.getBool("alt_intro");

engines/sky/control.cpp

@@ -284 +284 @@
         _savePanButton    = createResource(      _sprites.button, 3, 0, 58,  39, 48, SAVE_GAME_PANEL, MAINPANEL);
         _dosPanButton     = createResource(      _sprites.button, 3, 0, 58,  59, 93,     QUIT_TO_DOS, MAINPANEL);
         _restartPanButton = createResource(      _sprites.button, 3, 0, 58,  79, 94,         RESTART, MAINPANEL);
-        if (SkyEngine::_systemVars.systemFlags & SF_FX_OFF)
-                _fxPanButton  = createResource(      _sprites.button, 3, 0, 58,  99, 87,       TOGGLE_FX, MAINPANEL);
-        else
-                _fxPanButton  = createResource(      _sprites.button, 3, 2, 58,  99, 86,       TOGGLE_FX, MAINPANEL);
+        _fxPanButton      = createResource(      _sprites.button, 3, 0, 58,  99, 90,       TOGGLE_FX, MAINPANEL);
 
         if (SkyEngine::isCDVersion()) { // CD Version: Toggle text/speech
-                _musicPanButton = createResource(      _sprites.button, 3, 0, 58, 119, 52,     TOGGLE_TEXT, MAINPANEL);
+                _musicPanButton = createResource(    _sprites.button, 3, 0, 58, 119, 52,     TOGGLE_TEXT, MAINPANEL);
         } else {                       // disk version: toggle music on/off
-                _musicPanButton = createResource(      _sprites.button, 3, 0, 58, 119, 91,       TOGGLE_MS, MAINPANEL);
+                _musicPanButton = createResource(    _sprites.button, 3, 0, 58, 119, 91,       TOGGLE_MS, MAINPANEL);
         }
         _bodge            = createResource(  _sprites.musicBodge, 2, 1, 98, 115,  0,      DO_NOTHING, MAINPANEL);
         _yesNo            = createResource(       _sprites.yesNo, 1, 0, -2,  40,  0,      DO_NOTHING, MAINPANEL);
@@ -474 +471 @@
         else
                 _skyScreen->setPalette(60510);
 
+        // Set initial button lights
+        _fxPanButton->_curSprite =
+                (SkyEngine::_systemVars.systemFlags & SF_FX_OFF ? 0 : 2);
+
+        // music button only available in floppy version
+        if (!SkyEngine::isCDVersion())
+                _musicPanButton->_curSprite =
+                        (SkyEngine::_systemVars.systemFlags & SF_MUS_OFF ? 0 : 2);
+
         drawMainPanel();
 
         _savedMouse = _skyMouse->giveCurrentMouseType();
@@ -573 +579 @@
                 _mouseClicked = true;
                 return doMusicSlide();
         case TOGGLE_FX:
-                return toggleFx(pButton);
+                toggleFx(pButton);
+                return TOGGLED;
         case TOGGLE_MS:
-                animClick(pButton);
-                toggleMusic();
+                toggleMusic(pButton);
                 return TOGGLED;
         case TOGGLE_TEXT:
                 animClick(pButton);
@@ -647 +653 @@
                         wantMouse = MOUSE_NORMAL;
         }
         _mouseClicked = false;
+        _skyMouse->spriteMouse(MOUSE_NORMAL, 0, 0);
         if (dlgTextDat)
                 free(dlgTextDat);
         delete dlgText;
@@ -708 +715 @@
         return SPEED_CHANGED;
 }
 
-uint16 Control::toggleFx(ConResource *pButton) {
+void Control::toggleFx(ConResource *pButton) {
 
         SkyEngine::_systemVars.systemFlags ^= SF_FX_OFF;
         if (SkyEngine::_systemVars.systemFlags & SF_FX_OFF) {
                 pButton->_curSprite = 0;
-                pButton->_text = 0x7000 + 87;
                 _statusBar->setToText(0x7000 + 87);
         } else {
                 pButton->_curSprite = 2;
-                pButton->_text = 0x7000 + 86;
                 _statusBar->setToText(0x7000 + 86);
         }
 
         ConfMan.setBool("sfx_mute", (SkyEngine::_systemVars.systemFlags & SF_FX_OFF) != 0);
 
         pButton->drawToScreen(WITH_MASK);
-        buttonControl(pButton);
         _system->updateScreen();
-        return TOGGLED;
 }
 
 uint16 Control::toggleText(void) {
@@ -756 +759 @@
         return TOGGLED;
 }
 
-void Control::toggleMusic(void) {
+void Control::toggleMusic(ConResource *pButton) {
 
+        SkyEngine::_systemVars.systemFlags ^= SF_MUS_OFF;
         if (SkyEngine::_systemVars.systemFlags & SF_MUS_OFF) {
-                SkyEngine::_systemVars.systemFlags &= ~SF_MUS_OFF;
+                _skyMusic->startMusic(0);
+                pButton->_curSprite = 0;
+                _statusBar->setToText(0x7000 + 89);
+        } else {
                 _skyMusic->startMusic(SkyEngine::_systemVars.currentMusic);
+                pButton->_curSprite = 2;
                 _statusBar->setToText(0x7000 + 88);
-        } else {
-                SkyEngine::_systemVars.systemFlags |= SF_MUS_OFF;
-                _skyMusic->startMusic(0);
-                _statusBar->setToText(0x7000 + 89);
         }
+
+        ConfMan.setBool("music_mute", (SkyEngine::_systemVars.systemFlags & SF_MUS_OFF) != 0);
+
+        pButton->drawToScreen(WITH_MASK);
+        _system->updateScreen();
 }
 
 uint16 Control::shiftDown(uint8 speed) {