[Scummvm-cvs-logs] SF.net SVN: scummvm:[43182] scummvm/branches/gsoc2009-mods

nolange at users.sourceforge.net nolange at users.sourceforge.net
Sun Aug 9 20:59:22 CEST 2009


Revision: 43182
          http://scummvm.svn.sourceforge.net/scummvm/?rev=43182&view=rev
Author:   nolange
Date:     2009-08-09 18:59:22 +0000 (Sun, 09 Aug 2009)

Log Message:
-----------
fixed up some missing newlines
removed MSVC6 disable pragmas, the warnings are already disabled in the project files

Modified Paths:
--------------
    scummvm/branches/gsoc2009-mods/common/scummsys.h
    scummvm/branches/gsoc2009-mods/engines/kyra/sound_amiga.cpp
    scummvm/branches/gsoc2009-mods/engines/kyra/sound_intern.h
    scummvm/branches/gsoc2009-mods/engines/scumm/player_v4a.cpp
    scummvm/branches/gsoc2009-mods/sound/mods/maxtrax.cpp
    scummvm/branches/gsoc2009-mods/sound/mods/paula.cpp
    scummvm/branches/gsoc2009-mods/sound/mods/paula.h
    scummvm/branches/gsoc2009-mods/sound/mods/tfmx.cpp

Modified: scummvm/branches/gsoc2009-mods/common/scummsys.h
===================================================================
--- scummvm/branches/gsoc2009-mods/common/scummsys.h	2009-08-09 18:39:56 UTC (rev 43181)
+++ scummvm/branches/gsoc2009-mods/common/scummsys.h	2009-08-09 18:59:22 UTC (rev 43182)
@@ -44,18 +44,6 @@
 
 		#ifdef _MSC_VER
 		#pragma once
-		#if (_MSC_VER < 1300)
-		#pragma warning( disable : 4068 ) // turn off "unknown pragma" warning
-		#pragma	warning( disable : 4103 ) // turn off "alignement changed after including header" warning. We use pack-start.h file
-		#pragma warning( disable : 4244 ) // turn off "conversion type" warning
-		#pragma warning( disable : 4250 ) // turn off "inherits via dominance" warning
-		#pragma warning( disable : 4351 ) // turn off "new behavior ... will be default initialized" warning
-		#pragma warning( disable : 4355 ) // turn off "base member init" warning
-		#pragma warning( disable : 4510 ) // turn off "default constructor could not be generated"
-		#pragma warning( disable : 4610 ) // turn off "struct can never be instantiated - user defined constructor required"
-		#pragma warning( disable : 4701 ) // turn off "potentially uninitialized variables" warning
-		#pragma warning( disable : 4800 ) // turn off "forcing value to bool 'true' or 'false' (performance warning)"
-		#endif
 
 		// vsnprintf is already defined in Visual Studio 2008
 		#if (_MSC_VER < 1500)

Modified: scummvm/branches/gsoc2009-mods/engines/kyra/sound_amiga.cpp
===================================================================
--- scummvm/branches/gsoc2009-mods/engines/kyra/sound_amiga.cpp	2009-08-09 18:39:56 UTC (rev 43181)
+++ scummvm/branches/gsoc2009-mods/engines/kyra/sound_amiga.cpp	2009-08-09 18:59:22 UTC (rev 43182)
@@ -384,4 +384,4 @@
 	{ 0x0156, 0x3C, 0x13, 120,  2 }
 };
 
-} // end of namespace
\ No newline at end of file
+} // end of namespace

Modified: scummvm/branches/gsoc2009-mods/engines/kyra/sound_intern.h
===================================================================
--- scummvm/branches/gsoc2009-mods/engines/kyra/sound_intern.h	2009-08-09 18:39:56 UTC (rev 43181)
+++ scummvm/branches/gsoc2009-mods/engines/kyra/sound_intern.h	2009-08-09 18:59:22 UTC (rev 43182)
@@ -314,4 +314,3 @@
 } // end of namespace Kyra
 
 #endif
-

Modified: scummvm/branches/gsoc2009-mods/engines/scumm/player_v4a.cpp
===================================================================
--- scummvm/branches/gsoc2009-mods/engines/scumm/player_v4a.cpp	2009-08-09 18:39:56 UTC (rev 43181)
+++ scummvm/branches/gsoc2009-mods/engines/scumm/player_v4a.cpp	2009-08-09 18:59:22 UTC (rev 43182)
@@ -23,7 +23,6 @@
  *
  */
 
-
 #include "engines/engine.h"
 #include "scumm/player_v4a.h"
 #include "scumm/scumm.h"

Modified: scummvm/branches/gsoc2009-mods/sound/mods/maxtrax.cpp
===================================================================
--- scummvm/branches/gsoc2009-mods/sound/mods/maxtrax.cpp	2009-08-09 18:39:56 UTC (rev 43181)
+++ scummvm/branches/gsoc2009-mods/sound/mods/maxtrax.cpp	2009-08-09 18:59:22 UTC (rev 43182)
@@ -22,6 +22,7 @@
  * $Id$
  *
  */
+
 #include "common/scummsys.h"
 #include "common/endian.h"
 #include "common/stream.h"
@@ -977,4 +978,4 @@
 
 }	// End of namespace Audio
 
-#endif // #if defined(SOUND_MODS_MAXTRAX_H)
\ No newline at end of file
+#endif // #if defined(SOUND_MODS_MAXTRAX_H)

Modified: scummvm/branches/gsoc2009-mods/sound/mods/paula.cpp
===================================================================
--- scummvm/branches/gsoc2009-mods/sound/mods/paula.cpp	2009-08-09 18:39:56 UTC (rev 43181)
+++ scummvm/branches/gsoc2009-mods/sound/mods/paula.cpp	2009-08-09 18:59:22 UTC (rev 43182)
@@ -28,7 +28,7 @@
 namespace Audio {
 
 Paula::Paula(bool stereo, int rate, uint interruptFreq) :
-		_stereo(stereo), _rate(rate), _periodScale((kPalSystemClock / 2.0) / rate), _intFreq(interruptFreq) {
+		_stereo(stereo), _rate(rate), _periodScale((double)kPalPaulaClock / rate), _intFreq(interruptFreq) {
 
 	clearVoices();
 	_voice[0].panning = 191;

Modified: scummvm/branches/gsoc2009-mods/sound/mods/paula.h
===================================================================
--- scummvm/branches/gsoc2009-mods/sound/mods/paula.h	2009-08-09 18:39:56 UTC (rev 43181)
+++ scummvm/branches/gsoc2009-mods/sound/mods/paula.h	2009-08-09 18:59:22 UTC (rev 43182)
@@ -44,7 +44,9 @@
 		kPalSystemClock  = 7093790,
 		kNtscSystemClock = 7159090,
 		kPalCiaClock     = kPalSystemClock / 10,
-		kNtscCiaClock    = kNtscSystemClock / 10
+		kNtscCiaClock    = kNtscSystemClock / 10,
+		kPalPaulaClock   = kPalSystemClock / 2,
+		kNtscPauleClock  = kNtscSystemClock / 2
 	};
 
 	Paula(bool stereo = false, int rate = 44100, uint interruptFreq = 0);

Modified: scummvm/branches/gsoc2009-mods/sound/mods/tfmx.cpp
===================================================================
--- scummvm/branches/gsoc2009-mods/sound/mods/tfmx.cpp	2009-08-09 18:39:56 UTC (rev 43181)
+++ scummvm/branches/gsoc2009-mods/sound/mods/tfmx.cpp	2009-08-09 18:59:22 UTC (rev 43182)
@@ -1179,4 +1179,3 @@
 }	// End of namespace
 
 #endif // #if defined(SOUND_MODS_TFMX_H)
-


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