diff options
| author | Chris Apers | 2005-10-08 20:44:19 +0000 |
|---|---|---|
| committer | Chris Apers | 2005-10-08 20:44:19 +0000 |
| commit | 98bfe388fb9121985f900056348e663c0b441b75 (patch) | |
| tree | 832e7fa3cd7005d61759db25f10574a82af71e4a /scumm | |
| parent | 12f978c69a32aac7207e82684733c267fb2c455b (diff) | |
| download | scummvm-rg350-98bfe388fb9121985f900056348e663c0b441b75.tar.gz scummvm-rg350-98bfe388fb9121985f900056348e663c0b441b75.tar.bz2 scummvm-rg350-98bfe388fb9121985f900056348e663c0b441b75.zip | |
revert previous changes related to #ifdefs
svn-id: r18968
Diffstat (limited to 'scumm')
| -rw-r--r-- | scumm/imuse_digi/dimuse.cpp | 4 | ||||
| -rw-r--r-- | scumm/imuse_digi/dimuse_music.cpp | 4 | ||||
| -rw-r--r-- | scumm/imuse_digi/dimuse_tables.cpp | 4 | ||||
| -rw-r--r-- | scumm/imuse_digi/dimuse_track.cpp | 4 |
4 files changed, 0 insertions, 16 deletions
diff --git a/scumm/imuse_digi/dimuse.cpp b/scumm/imuse_digi/dimuse.cpp index eaa89c1790..f6f2d71070 100644 --- a/scumm/imuse_digi/dimuse.cpp +++ b/scumm/imuse_digi/dimuse.cpp @@ -18,8 +18,6 @@ * $Header$ */ -#ifndef DISABLE_SCUMM_7_8 - #include "common/stdafx.h" #include "common/system.h" #include "common/timer.h" @@ -411,5 +409,3 @@ void IMuseDigital::switchToNextRegion(Track *track) { } } // End of namespace Scumm - -#endif diff --git a/scumm/imuse_digi/dimuse_music.cpp b/scumm/imuse_digi/dimuse_music.cpp index 00a11a9684..e755c4f829 100644 --- a/scumm/imuse_digi/dimuse_music.cpp +++ b/scumm/imuse_digi/dimuse_music.cpp @@ -18,8 +18,6 @@ * $Header$ */ -#ifndef DISABLE_SCUMM_7_8 - #include "common/stdafx.h" #include "common/scummsys.h" #include "scumm/scumm.h" @@ -443,5 +441,3 @@ void IMuseDigital::playFtMusic(const char *songName, int opcode, int volume) { } // End of namespace Scumm - -#endif diff --git a/scumm/imuse_digi/dimuse_tables.cpp b/scumm/imuse_digi/dimuse_tables.cpp index e2409a61f8..117061ba9d 100644 --- a/scumm/imuse_digi/dimuse_tables.cpp +++ b/scumm/imuse_digi/dimuse_tables.cpp @@ -18,8 +18,6 @@ * $Header$ */ -#ifndef DISABLE_SCUMM_7_8 - #include "common/stdafx.h" #include "scumm/imuse_digi/dimuse.h" @@ -880,5 +878,3 @@ _GRELEASEPTR(GBVARS_FTSEQNAMES_INDEX , GBVARS_SCUMM) _GEND #endif - -#endif diff --git a/scumm/imuse_digi/dimuse_track.cpp b/scumm/imuse_digi/dimuse_track.cpp index f4e99ee3e4..f0fda62f8a 100644 --- a/scumm/imuse_digi/dimuse_track.cpp +++ b/scumm/imuse_digi/dimuse_track.cpp @@ -18,8 +18,6 @@ * $Header$ */ -#ifndef DISABLE_SCUMM_7_8 - #include "common/stdafx.h" #include "common/timer.h" @@ -362,5 +360,3 @@ IMuseDigital::Track *IMuseDigital::cloneToFadeOutTrack(Track *track, int fadeDel } } // End of namespace Scumm - -#endif |