[Scummvm-cvs-logs] SF.net SVN: scummvm: [33030] scummvm/trunk/engines/kyra/sound_towns.cpp

athrxx at users.sourceforge.net athrxx at users.sourceforge.net
Sun Jul 13 14:20:24 CEST 2008


Revision: 33030
          http://scummvm.svn.sourceforge.net/scummvm/?rev=33030&view=rev
Author:   athrxx
Date:     2008-07-13 05:20:24 -0700 (Sun, 13 Jul 2008)

Log Message:
-----------
- fix for bug #2016965: KYRA: does not compile in MSVC71

Modified Paths:
--------------
    scummvm/trunk/engines/kyra/sound_towns.cpp

Modified: scummvm/trunk/engines/kyra/sound_towns.cpp
===================================================================
--- scummvm/trunk/engines/kyra/sound_towns.cpp	2008-07-13 11:07:56 UTC (rev 33029)
+++ scummvm/trunk/engines/kyra/sound_towns.cpp	2008-07-13 12:20:24 UTC (rev 33030)
@@ -34,11 +34,6 @@
 
 #include "common/util.h"
 
-#ifdef _MSC_VER
-#define	_USE_MATH_DEFINES
-#endif
-#include <math.h>
-
 #define		EUPHONY_FADEOUT_TICKS		600
 
 namespace Kyra {
@@ -2657,7 +2652,7 @@
 	delete [] _oprSinTbl;
 	_oprSinTbl = new uint32[1024];
 	for (int i = 0; i < 1024; i++) {
-		double val = sin((double) (((i << 1) + 1) * M_PI / 1024.0));
+		double val = sin((double) (((i << 1) + 1) * PI / 1024.0));
 		double d_dcb = log(1.0 / (double)ABS(val)) / log(2.0) * 256.0;
 		int32 i_dcb = (int32)(2.0 * d_dcb);
 		i_dcb = (i_dcb & 1) ? (i_dcb >> 1) + 1 : (i_dcb >> 1);


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