diff options
| author | Bjørn Lindeijer <bjorn@lindeijer.nl> | 2005-01-19 12:10:31 +0000 |
|---|---|---|
| committer | Bjørn Lindeijer <bjorn@lindeijer.nl> | 2005-01-19 12:10:31 +0000 |
| commit | ad12a9189f33e65de827219eb573a6e63c7862c9 (patch) | |
| tree | 28021f83fb1ff5495ebc67e533302b2669078a28 /src/sound | |
| parent | 36a25f2ac86f33c1b11f07d2096c159422b9e997 (diff) | |
| download | mana-ad12a9189f33e65de827219eb573a6e63c7862c9.tar.gz mana-ad12a9189f33e65de827219eb573a6e63c7862c9.tar.bz2 mana-ad12a9189f33e65de827219eb573a6e63c7862c9.tar.xz mana-ad12a9189f33e65de827219eb573a6e63c7862c9.zip | |
*** empty log message ***
Diffstat (limited to 'src/sound')
| -rw-r--r-- | src/sound/sound.cpp | 9 | ||||
| -rw-r--r-- | src/sound/sound.h | 14 |
2 files changed, 4 insertions, 19 deletions
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 <iostream> #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 <SDL/SDL.h> -#include <SDL/SDL_mixer.h> +#include <SDL.h> +#include <SDL_mixer.h> #include <map> #include <string> #include <fstream> -#ifdef __DEBUG - #include <iostream> -#endif - typedef short SOUND_SID ; /** @@ -85,5 +76,4 @@ class Sound { bool isMaxVol(int); }; -#endif /* not WIN32 */ #endif |