[Scummvm-cvs-logs] SF.net SVN: scummvm: [26508] scummvm/trunk/engines/gob/sound.cpp

drmccoy at users.sourceforge.net drmccoy at users.sourceforge.net
Sun Apr 15 18:26:13 CEST 2007


Revision: 26508
          http://scummvm.svn.sourceforge.net/scummvm/?rev=26508&view=rev
Author:   drmccoy
Date:     2007-04-15 09:26:12 -0700 (Sun, 15 Apr 2007)

Log Message:
-----------
Fixing compile for me, hopefully not breaking it for the MSVC8 again...

Modified Paths:
--------------
    scummvm/trunk/engines/gob/sound.cpp

Modified: scummvm/trunk/engines/gob/sound.cpp
===================================================================
--- scummvm/trunk/engines/gob/sound.cpp	2007-04-15 16:03:10 UTC (rev 26507)
+++ scummvm/trunk/engines/gob/sound.cpp	2007-04-15 16:26:12 UTC (rev 26508)
@@ -235,7 +235,7 @@
 	_fade = true;
 	_fadeVol = 65536;
 	_fadeSamples = (int) (fadeLength * (((double) _rate) / 10.0));
-	_fadeVolStep = MAX(1UL, 65536 / _fadeSamples);
+	_fadeVolStep = MAX((int32) 1, (int32) (65536 / _fadeSamples));
 	_curFadeSamples = 0;
 }
 
@@ -341,7 +341,7 @@
 		_fade = true;
 		_fadeVol = 0;
 		_fadeSamples = (int) (fadeLength * (((double) _rate) / 10.0));
-		_fadeVolStep = - (int32)MAX(1UL, 65536 / _fadeSamples);
+		_fadeVolStep = - MAX((int32) 1, (int32) (65536 / _fadeSamples));
 	}
 }
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.




More information about the Scummvm-git-logs mailing list