fixed up some missing newlines
removed MSVC6 disable pragmas, the warnings are already disabled in the project files svn-id: r43182
This commit is contained in:
parent
7de81f0c07
commit
b4c689a3c1
8 changed files with 7 additions and 19 deletions
|
@ -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)
|
||||
|
|
|
@ -384,4 +384,4 @@ const EffectEntry tableEffectsGame[120] = {
|
|||
{ 0x0156, 0x3C, 0x13, 120, 2 }
|
||||
};
|
||||
|
||||
} // end of namespace
|
||||
} // end of namespace
|
||||
|
|
|
@ -314,4 +314,3 @@ protected:
|
|||
} // end of namespace Kyra
|
||||
|
||||
#endif
|
||||
|
||||
|
|
|
@ -23,7 +23,6 @@
|
|||
*
|
||||
*/
|
||||
|
||||
|
||||
#include "engines/engine.h"
|
||||
#include "scumm/player_v4a.h"
|
||||
#include "scumm/scumm.h"
|
||||
|
|
|
@ -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)
|
||||
#endif // #if defined(SOUND_MODS_MAXTRAX_H)
|
||||
|
|
|
@ -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;
|
||||
|
|
|
@ -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);
|
||||
|
|
|
@ -1179,4 +1179,3 @@ void displayPatternstep(const void *const vptr) {}
|
|||
} // End of namespace
|
||||
|
||||
#endif // #if defined(SOUND_MODS_TFMX_H)
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue