diff options
| author | Paul Gilbert | 2017-08-13 21:21:30 -0400 |
|---|---|---|
| committer | Paul Gilbert | 2017-08-13 21:21:30 -0400 |
| commit | a8e400ef711bf7756ae93dd10d4a2224e3527b3c (patch) | |
| tree | 6e98b6c7b08ef7a43b95bf24b0f4c75ae4d759ff | |
| parent | d137aba8954484c73c2be3c03d75a6dab63b9dff (diff) | |
| download | scummvm-rg350-a8e400ef711bf7756ae93dd10d4a2224e3527b3c.tar.gz scummvm-rg350-a8e400ef711bf7756ae93dd10d4a2224e3527b3c.tar.bz2 scummvm-rg350-a8e400ef711bf7756ae93dd10d4a2224e3527b3c.zip | |
TITANIC: Show PET Sound sliders
| -rw-r--r-- | engines/titanic/pet_control/pet_sound.cpp | 18 | ||||
| -rw-r--r-- | engines/titanic/pet_control/pet_sound.h | 8 |
2 files changed, 13 insertions, 13 deletions
diff --git a/engines/titanic/pet_control/pet_sound.cpp b/engines/titanic/pet_control/pet_sound.cpp index f4d45038e9..f4fd821187 100644 --- a/engines/titanic/pet_control/pet_sound.cpp +++ b/engines/titanic/pet_control/pet_sound.cpp @@ -51,11 +51,11 @@ bool CPetSound::setup(CPetControl *petControl, CPetGlyphs *owner) { _parrotVolume.setThumbSize(Point(25, 15)); _parrotVolume.translate(Point(415, 376)); - _parrotVolume.setOrientation(ORIENTATION_HORIZONTAL); - _parrotVolume.setBounds(Rect(17, 60, 147, 75)); - _parrotVolume.setSlidingBounds(Rect(35, 65, 127, 71)); - _parrotVolume.setThumbSize(Point(25, 15)); - _parrotVolume.translate(Point(415, 376)); + _speechVolume.setOrientation(ORIENTATION_HORIZONTAL); + _speechVolume.setBounds(Rect(17, 60, 147, 75)); + _speechVolume.setSlidingBounds(Rect(35, 65, 127, 71)); + _speechVolume.setThumbSize(Point(25, 15)); + _speechVolume.translate(Point(415, 376)); _element.setBounds(Rect(0, 0, 165, 77)); _element.translate(Point(415, 376)); @@ -93,10 +93,10 @@ bool CPetSound::reset() { if (pet) { setName("PetSound", pet); _element.reset("PetVolChannels", pet, MODE_UNSELECTED); - _musicVolume.reset("PetVolSlug"); - _masterVolume.reset("PetVolSlug"); - _parrotVolume.reset("PetVolSlug"); - _speechVolume.reset("PetVolSlug"); + _musicVolume.setupThumb2("PetVolSlug", pet); + _masterVolume.setupThumb2("PetVolSlug", pet); + _parrotVolume.setupThumb2("PetVolSlug", pet); + _speechVolume.setupThumb2("PetVolSlug", pet); CPetSection *section = getPetSection(); uint col = section->getColor(0); diff --git a/engines/titanic/pet_control/pet_sound.h b/engines/titanic/pet_control/pet_sound.h index fed4f43f92..e4fd21006a 100644 --- a/engines/titanic/pet_control/pet_sound.h +++ b/engines/titanic/pet_control/pet_sound.h @@ -35,10 +35,10 @@ class CPetRealLife; class CPetSound : public CPetGlyph { private: CPetGfxElement _element; - CPetSlider _masterVolume; - CPetSlider _musicVolume; - CPetSlider _parrotVolume; - CPetSlider _speechVolume; + CPetSoundSlider _masterVolume; + CPetSoundSlider _musicVolume; + CPetSoundSlider _parrotVolume; + CPetSoundSlider _speechVolume; CTextControl _textMasterVolume; CTextControl _textMusicVolume; CTextControl _textParrotVolume; |