[Scummvm-cvs-logs] CVS: scummvm/scumm imuse_digi.cpp,1.78,1.79
Max Horn
fingolfin at users.sourceforge.net
Thu Dec 25 07:20:00 CET 2003
- Previous message: [Scummvm-cvs-logs] CVS: scummvm/scumm sound.h,1.58,1.59 resource.cpp,1.177,1.178 script_v5.cpp,1.212,1.213 sound.cpp,1.295,1.296 scummvm.cpp,2.517,2.518
- Next message: [Scummvm-cvs-logs] CVS: scummvm/scumm imuse_digi.cpp,1.79,1.80
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Update of /cvsroot/scummvm/scummvm/scumm
In directory sc8-pr-cvs1:/tmp/cvs-serv20435
Modified Files:
imuse_digi.cpp
Log Message:
workaround crash on Intel systems (and it was *not* caused by me, mind you! :-)
Index: imuse_digi.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/imuse_digi.cpp,v
retrieving revision 1.78
retrieving revision 1.79
diff -u -d -r1.78 -r1.79
--- imuse_digi.cpp 25 Dec 2003 14:03:04 -0000 1.78
+++ imuse_digi.cpp 25 Dec 2003 15:19:49 -0000 1.79
@@ -1021,7 +1021,7 @@
}
_channel[chan].vol = d * 1000;
if (_channel[chan].volFadeUsed)
- _channel[chan].volFadeStep = (_channel[chan].volFadeDest - _channel[chan].vol) / (((1000 * _channel[chan].volFadeDelay) / 60) / 40);
+ _channel[chan].volFadeStep = (_channel[chan].volFadeDest - _channel[chan].vol) * 60 * 40 / (1000 * _channel[chan].volFadeDelay);
return;
case 0x700: // set pan
debug(5, "ImuseSetParam (0x700), sample(%d), pan(%d)", sample, d);
@@ -1044,7 +1044,7 @@
case 14: // ImuseFadeParam
switch (sub_cmd) {
case 0x600: // set new volume with fading
- debug(5, "ImuseFadeParam - fade sample(%d), to volume(%d) with 60hz ticks(%d)", sample, d, e);
+ debug(0, "ImuseFadeParam - fade sample(%d), to volume(%d) with 60hz ticks(%d)", sample, d, e);
if ((_scumm->_gameId == GID_DIG) && (_scumm->_features & GF_DEMO)) {
stopSound(sample);
return;
@@ -1061,7 +1061,7 @@
}
_channel[chan].volFadeDelay = e;
_channel[chan].volFadeDest = d * 1000;
- _channel[chan].volFadeStep = (_channel[chan].volFadeDest - _channel[chan].vol) / (((1000 * e) / 60) / 40);
+ _channel[chan].volFadeStep = (_channel[chan].volFadeDest - _channel[chan].vol) * 60 * 40 / (1000 * e);
_channel[chan].volFadeUsed = true;
debug(5, "ImuseFadeParam: vol %d, volDest %d, step %d", _channel[chan].vol, d * 1000, _channel[chan].volFadeStep);
return;
- Previous message: [Scummvm-cvs-logs] CVS: scummvm/scumm sound.h,1.58,1.59 resource.cpp,1.177,1.178 script_v5.cpp,1.212,1.213 sound.cpp,1.295,1.296 scummvm.cpp,2.517,2.518
- Next message: [Scummvm-cvs-logs] CVS: scummvm/scumm imuse_digi.cpp,1.79,1.80
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the Scummvm-git-logs
mailing list