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

sev- sev at scummvm.org
Thu May 29 10:00:33 CEST 2014


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:
b59026f1dd FULLPIPE: Fix ModalMainMenu::updateSoundVolume()


Commit: b59026f1ddd49a7cd1c976803d49c461a541b65f
    https://github.com/scummvm/scummvm/commit/b59026f1ddd49a7cd1c976803d49c461a541b65f
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2014-05-29T10:59:17+03:00

Commit Message:
FULLPIPE: Fix ModalMainMenu::updateSoundVolume()

Changed paths:
    engines/fullpipe/modal.cpp



diff --git a/engines/fullpipe/modal.cpp b/engines/fullpipe/modal.cpp
index ca082e6..743c220 100644
--- a/engines/fullpipe/modal.cpp
+++ b/engines/fullpipe/modal.cpp
@@ -1086,17 +1086,17 @@ void ModalMainMenu::updateSoundVolume(Sound *snd) {
 			b = 800 - dx;
 		}
 
-		int32 pp = b * a; //(0x51EB851F * b * a) >> 32) >> 8; // TODO FIXME
+		int32 pp = b * a;
 
-		snd->setPanAndVolume(pan + (pp >> 31) + pp, par);
+		snd->setPanAndVolume(pan + pp / 800, par);
 
 		return;
 	}
 
 	int dx = _screct.left - ani->_ox;
 	if (dx <= 800) {
-		int32 s = 0x51EB851F * (800 - dx) * (g_fp->_sfxVolume - (-3500)); // TODO FIXME
-		int32 p = -3500 + (s >> 31) + (s >> 8);
+		int32 s = (800 - dx) * (g_fp->_sfxVolume - (-3500));
+		int32 p = -3500 + s / 800;
 
 		if (p > g_fp->_sfxVolume)
 			p = g_fp->_sfxVolume;






More information about the Scummvm-git-logs mailing list