[Scummvm-git-logs] scummvm master -> a8e400ef711bf7756ae93dd10d4a2224e3527b3c

[dreammaster]

This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
a8e400ef71 TITANIC: Show PET Sound sliders


Commit: a8e400ef711bf7756ae93dd10d4a2224e3527b3c
    https://github.com/scummvm/scummvm/commit/a8e400ef711bf7756ae93dd10d4a2224e3527b3c
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2017-08-13T21:21:30-04:00

Commit Message:
TITANIC: Show PET Sound sliders

Changed paths:
    engines/titanic/pet_control/pet_sound.cpp
    engines/titanic/pet_control/pet_sound.h


diff --git a/engines/titanic/pet_control/pet_sound.cpp b/engines/titanic/pet_control/pet_sound.cpp
index f4d4503..f4fd821 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 fed4f43..e4fd210 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;