diff options
| author | Nicola Mettifogo | 2007-09-19 08:40:12 +0000 |
|---|---|---|
| committer | Nicola Mettifogo | 2007-09-19 08:40:12 +0000 |
| commit | 258901bab96f0050385a9912c8ea0fe2a41b2d6f (patch) | |
| tree | a3ae8675b679c9f3b58ac8d97c79369502ea23c1 /sound/mods | |
| parent | a89694c0d61a75a960f5bec6c498659c988401cc (diff) | |
| download | scummvm-rg350-258901bab96f0050385a9912c8ea0fe2a41b2d6f.tar.gz scummvm-rg350-258901bab96f0050385a9912c8ea0fe2a41b2d6f.tar.bz2 scummvm-rg350-258901bab96f0050385a9912c8ea0fe2a41b2d6f.zip | |
Merged common/stdafx.h into common/scummsys.h. All referencing files have been updated.
svn-id: r28966
Diffstat (limited to 'sound/mods')
| -rw-r--r-- | sound/mods/module.cpp | 4 | ||||
| -rw-r--r-- | sound/mods/protracker.cpp | 2 | ||||
| -rw-r--r-- | sound/mods/protracker.h | 5 | ||||
| -rw-r--r-- | sound/mods/rjp1.cpp | 1 | ||||
| -rw-r--r-- | sound/mods/soundfx.cpp | 1 |
5 files changed, 3 insertions, 10 deletions
diff --git a/sound/mods/module.cpp b/sound/mods/module.cpp index 96d977d422..90921d24d1 100644 --- a/sound/mods/module.cpp +++ b/sound/mods/module.cpp @@ -23,8 +23,6 @@ * */ -#include "common/stdafx.h" - #include "sound/mods/module.h" #include "common/util.h" @@ -173,7 +171,7 @@ bool Module::load(Common::SeekableReadStream &st, int offs) { if (!sample[i].len) { sample[i].data = 0; } else { - if (offs != 0) { + if (offs != 0) { // For modules that use common samples for (int j = 0; j < NUM_SAMPLES; ++j) { if (!scumm_stricmp((const char *)commonSamples[j].name, (const char *)sample[i].name)) { diff --git a/sound/mods/protracker.cpp b/sound/mods/protracker.cpp index 271e3d8e3e..f40b61ad09 100644 --- a/sound/mods/protracker.cpp +++ b/sound/mods/protracker.cpp @@ -23,8 +23,6 @@ * */ -#include "common/stdafx.h" - #include "sound/mods/protracker.h" #include "sound/mods/paula.h" #include "sound/mods/module.h" diff --git a/sound/mods/protracker.h b/sound/mods/protracker.h index 23e90f0954..ab3e042475 100644 --- a/sound/mods/protracker.h +++ b/sound/mods/protracker.h @@ -26,7 +26,6 @@ #ifndef SOUND_MODS_PROTRACKER_H #define SOUND_MODS_PROTRACKER_H -#include "common/stdafx.h" #include "common/stream.h" namespace Audio { @@ -36,9 +35,9 @@ class AudioStream; /* * Factory function for ProTracker streams. Reads all data from the * given ReadStream and creates an AudioStream from this. No reference - * to the 'stream' object is kept, so you can safely delete it after + * to the 'stream' object is kept, so you can safely delete it after * invoking this factory. - * + * * @param stream the ReadStream from which to read the ProTracker data * @param rate TODO * @param stereo TODO diff --git a/sound/mods/rjp1.cpp b/sound/mods/rjp1.cpp index 3f5582de51..59b8833607 100644 --- a/sound/mods/rjp1.cpp +++ b/sound/mods/rjp1.cpp @@ -23,7 +23,6 @@ * */ -#include "common/stdafx.h" #include "common/endian.h" #include "sound/mods/paula.h" diff --git a/sound/mods/soundfx.cpp b/sound/mods/soundfx.cpp index b68a664a39..057541307a 100644 --- a/sound/mods/soundfx.cpp +++ b/sound/mods/soundfx.cpp @@ -23,7 +23,6 @@ * */ -#include "common/stdafx.h" #include "common/endian.h" #include "sound/mods/paula.h" |