[Scummvm-cvs-logs] scummvm master -> 23f15c754faa7f719db6849ed6a754e06e019366

[sev-]

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:
23f15c754f FULLPIPE: Implement ModalMainMenu::setSliderPos()


Commit: 23f15c754faa7f719db6849ed6a754e06e019366
    https://github.com/scummvm/scummvm/commit/23f15c754faa7f719db6849ed6a754e06e019366
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2014-04-18T21:18:04+03:00

Commit Message:
FULLPIPE: Implement ModalMainMenu::setSliderPos()

Changed paths:
    engines/fullpipe/fullpipe.cpp
    engines/fullpipe/fullpipe.h
    engines/fullpipe/modal.cpp
    engines/fullpipe/sound.cpp



diff --git a/engines/fullpipe/fullpipe.cpp b/engines/fullpipe/fullpipe.cpp
index c6cc270..246510e 100644
--- a/engines/fullpipe/fullpipe.cpp
+++ b/engines/fullpipe/fullpipe.cpp
@@ -71,6 +71,7 @@ FullpipeEngine::FullpipeEngine(OSystem *syst, const ADGameDescription *gameDesc)
 	_flgSoundList = true;
 
 	_sfxVolume = 0;
+	_musicVolume = 0;
 
 	_inputController = 0;
 	_inputDisabled = false;
diff --git a/engines/fullpipe/fullpipe.h b/engines/fullpipe/fullpipe.h
index 5c3eeae..5718b16 100644
--- a/engines/fullpipe/fullpipe.h
+++ b/engines/fullpipe/fullpipe.h
@@ -164,6 +164,7 @@ public:
 	void setMusicVolume(int vol);
 
 	int _sfxVolume;
+	int _musicVolume;
 
 	GlobalMessageQueueList *_globalMessageQueueList;
 	MessageHandler *_messageHandlers;
diff --git a/engines/fullpipe/modal.cpp b/engines/fullpipe/modal.cpp
index 85cb065..e138df2 100644
--- a/engines/fullpipe/modal.cpp
+++ b/engines/fullpipe/modal.cpp
@@ -1144,7 +1144,31 @@ void ModalMainMenu::enableDebugMenuButton() {
 }
 
 void ModalMainMenu::setSliderPos() {
-	warning("STUB: ModalMainMenu::setSliderPos()");
+	int x = 173 * (g_fp->_sfxVolume + 3000) / 3000 + 65;
+	PictureObject *obj = _areas[_menuSliderIdx]->picObjD;
+
+	if (x >= 65) {
+		if (x > 238)
+			x = 238;
+	} else {
+		x = 65;
+	}
+
+	obj->setOXY(x, obj->_oy);
+	_areas[_menuSliderIdx]->picObjL->setOXY(x, obj->_oy);
+
+	x = 173 * g_fp->_musicVolume / 255 + 65;
+	obj = _areas[_musicSliderIdx]->picObjD;
+
+	if (x >= 65) {
+		if (x > 238)
+			x = 238;
+	} else {
+		x = 65;
+	}
+
+	obj->setOXY(x, obj->_oy);
+	_areas[_musicSliderIdx]->picObjL->setOXY(x, obj->_oy);
 }
 
 ModalHelp::ModalHelp() {
diff --git a/engines/fullpipe/sound.cpp b/engines/fullpipe/sound.cpp
index b9ee473..4270b13 100644
--- a/engines/fullpipe/sound.cpp
+++ b/engines/fullpipe/sound.cpp
@@ -204,6 +204,8 @@ void FullpipeEngine::updateSoundVolume() {
 }
 
 void FullpipeEngine::setMusicVolume(int vol) {
+	_musicVolume = vol;
+
 	debug(3, "STUB FullpipeEngine::setMusicVolume()");
 }