From ad12a9189f33e65de827219eb573a6e63c7862c9 Mon Sep 17 00:00:00 2001 From: Bjørn Lindeijer Date: Wed, 19 Jan 2005 12:10:31 +0000 Subject: *** empty log message *** --- src/sound/sound.cpp | 9 ++------- src/sound/sound.h | 14 ++------------ 2 files changed, 4 insertions(+), 19 deletions(-) (limited to 'src/sound') diff --git a/src/sound/sound.cpp b/src/sound/sound.cpp index d9f8d4ce..ffaf2379 100644 --- a/src/sound/sound.cpp +++ b/src/sound/sound.cpp @@ -21,15 +21,12 @@ * $Id$ */ -#ifndef WIN32 - #include "sound.h" -#ifdef WIN32 - #pragma warning(disable:4312) +#ifdef __DEBUG + #include #endif - /** \brief install the sound engine \param voices overall reserved voices @@ -238,5 +235,3 @@ bool Sound::isMaxVol(int vol) { if (vol > 0 && vol < 128) return false; else return true; } - -#endif /* not WIN32 */ diff --git a/src/sound/sound.h b/src/sound/sound.h index 1404ba48..6209c13e 100644 --- a/src/sound/sound.h +++ b/src/sound/sound.h @@ -24,21 +24,12 @@ #ifndef _TMW_SOUND_H #define _TMW_SOUND_H -#ifndef WIN32 - -#ifdef WIN32 - #pragma warning(disable:4312) -#endif -#include -#include +#include +#include #include #include #include -#ifdef __DEBUG - #include -#endif - typedef short SOUND_SID ; /** @@ -85,5 +76,4 @@ class Sound { bool isMaxVol(int); }; -#endif /* not WIN32 */ #endif -- cgit v1.2.3-70-g09d2