diff options
| -rw-r--r-- | common/scummsys.h | 12 | ||||
| -rw-r--r-- | engines/kyra/sound_amiga.cpp | 2 | ||||
| -rw-r--r-- | engines/kyra/sound_intern.h | 1 | ||||
| -rw-r--r-- | engines/scumm/player_v4a.cpp | 1 | ||||
| -rw-r--r-- | sound/mods/maxtrax.cpp | 3 | ||||
| -rw-r--r-- | sound/mods/paula.cpp | 2 | ||||
| -rw-r--r-- | sound/mods/paula.h | 4 | ||||
| -rw-r--r-- | sound/mods/tfmx.cpp | 1 |
8 files changed, 7 insertions, 19 deletions
diff --git a/common/scummsys.h b/common/scummsys.h index 4fa3c80f71..dc87f7103a 100644 --- a/common/scummsys.h +++ b/common/scummsys.h @@ -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) diff --git a/engines/kyra/sound_amiga.cpp b/engines/kyra/sound_amiga.cpp index 78fead4979..1fb97037c5 100644 --- a/engines/kyra/sound_amiga.cpp +++ b/engines/kyra/sound_amiga.cpp @@ -384,4 +384,4 @@ const EffectEntry tableEffectsGame[120] = { { 0x0156, 0x3C, 0x13, 120, 2 } }; -} // end of namespace
\ No newline at end of file +} // end of namespace diff --git a/engines/kyra/sound_intern.h b/engines/kyra/sound_intern.h index f4826ad5fb..812c1b6392 100644 --- a/engines/kyra/sound_intern.h +++ b/engines/kyra/sound_intern.h @@ -314,4 +314,3 @@ protected: } // end of namespace Kyra #endif - diff --git a/engines/scumm/player_v4a.cpp b/engines/scumm/player_v4a.cpp index 55492e2439..f441b3b364 100644 --- a/engines/scumm/player_v4a.cpp +++ b/engines/scumm/player_v4a.cpp @@ -23,7 +23,6 @@ * */ - #include "engines/engine.h" #include "scumm/player_v4a.h" #include "scumm/scumm.h" diff --git a/sound/mods/maxtrax.cpp b/sound/mods/maxtrax.cpp index 80765913b3..17cf211c14 100644 --- a/sound/mods/maxtrax.cpp +++ b/sound/mods/maxtrax.cpp @@ -22,6 +22,7 @@ * $Id$ * */ + #include "common/scummsys.h" #include "common/endian.h" #include "common/stream.h" @@ -977,4 +978,4 @@ void MaxTrax::outPutScore(const Score &sc, int num) {} } // End of namespace Audio -#endif // #if defined(SOUND_MODS_MAXTRAX_H)
\ No newline at end of file +#endif // #if defined(SOUND_MODS_MAXTRAX_H) diff --git a/sound/mods/paula.cpp b/sound/mods/paula.cpp index e7a916f218..1f557e0ece 100644 --- a/sound/mods/paula.cpp +++ b/sound/mods/paula.cpp @@ -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; diff --git a/sound/mods/paula.h b/sound/mods/paula.h index 72432395d6..647dc5fe56 100644 --- a/sound/mods/paula.h +++ b/sound/mods/paula.h @@ -44,7 +44,9 @@ public: 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); diff --git a/sound/mods/tfmx.cpp b/sound/mods/tfmx.cpp index eda536ba34..419dc34bef 100644 --- a/sound/mods/tfmx.cpp +++ b/sound/mods/tfmx.cpp @@ -1179,4 +1179,3 @@ void displayPatternstep(const void *const vptr) {} } // End of namespace #endif // #if defined(SOUND_MODS_TFMX_H) - |