[Scummvm-cvs-logs] scummvm master -> e6c6eac9affaca53ac7f28d9a96d0a29d3826ed4

[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:
e6c6eac9af FULLPIPE: Implement ModalMainMenu::updateSliderPos()


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

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

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



diff --git a/engines/fullpipe/fullpipe.h b/engines/fullpipe/fullpipe.h
index 9ba5da3..5c3eeae 100644
--- a/engines/fullpipe/fullpipe.h
+++ b/engines/fullpipe/fullpipe.h
@@ -161,6 +161,7 @@ public:
 	void stopAllSoundStreams();
 	void stopAllSoundInstances(int id);
 	void updateSoundVolume();
+	void setMusicVolume(int vol);
 
 	int _sfxVolume;
 
diff --git a/engines/fullpipe/modal.cpp b/engines/fullpipe/modal.cpp
index 5cdc449..85cb065 100644
--- a/engines/fullpipe/modal.cpp
+++ b/engines/fullpipe/modal.cpp
@@ -1028,7 +1028,41 @@ void ModalMainMenu::updateVolume() {
 }
 
 void ModalMainMenu::updateSliderPos() {
-	warning("STUB: ModalMainMenu::updateSliderPos()");
+	if (_lastArea->picIdL == PIC_MNU_SLIDER_L) {
+		int x = g_fp->_mouseScreenPos.x + _sliderOffset;
+
+		if (x >= 65) {
+			if (x > 238)
+				x = 238;
+		} else {
+			x = 65;
+		}
+
+		_lastArea->picObjD->setOXY(x, _lastArea->picObjD->_oy);
+		_lastArea->picObjL->setOXY(x, _lastArea->picObjD->_oy);
+
+		int vol = 1000 * (3 * x - 195);
+		g_fp->_sfxVolume = vol / 173 - 3000;
+
+		if (!(vol / 173))
+			g_fp->_sfxVolume = -10000;
+
+		g_fp->updateSoundVolume();
+	} else if (_lastArea->picIdL == PIC_MNU_MUSICSLIDER_L) {
+		int x = g_fp->_mouseScreenPos.x + _sliderOffset;
+
+		if (x >= 65) {
+			if (x > 238)
+				x = 238;
+		} else {
+			x = 65;
+		}
+
+		_lastArea->picObjD->setOXY(x, _lastArea->picObjD->_oy);
+		_lastArea->picObjL->setOXY(x, _lastArea->picObjD->_oy);
+
+		g_fp->setMusicVolume(255 * (x - 65) / 173);
+	}
 }
 
 int ModalMainMenu::checkHover(Common::Point &point) {
diff --git a/engines/fullpipe/sound.cpp b/engines/fullpipe/sound.cpp
index bb6aabd..b9ee473 100644
--- a/engines/fullpipe/sound.cpp
+++ b/engines/fullpipe/sound.cpp
@@ -203,4 +203,8 @@ void FullpipeEngine::updateSoundVolume() {
 	debug(3, "STUB FullpipeEngine::updateSoundVolume()");
 }
 
+void FullpipeEngine::setMusicVolume(int vol) {
+	debug(3, "STUB FullpipeEngine::setMusicVolume()");
+}
+
 } // End of namespace Fullpipe