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 /engines/scumm/imuse | |
| 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 'engines/scumm/imuse')
| -rw-r--r-- | engines/scumm/imuse/imuse.cpp | 2 | ||||
| -rw-r--r-- | engines/scumm/imuse/imuse_part.cpp | 4 | ||||
| -rw-r--r-- | engines/scumm/imuse/imuse_player.cpp | 2 | ||||
| -rw-r--r-- | engines/scumm/imuse/instrument.cpp | 2 | ||||
| -rw-r--r-- | engines/scumm/imuse/instrument.h | 2 | ||||
| -rw-r--r-- | engines/scumm/imuse/sysex.h | 2 | ||||
| -rw-r--r-- | engines/scumm/imuse/sysex_samnmax.cpp | 2 | ||||
| -rw-r--r-- | engines/scumm/imuse/sysex_scumm.cpp | 2 |
8 files changed, 9 insertions, 9 deletions
diff --git a/engines/scumm/imuse/imuse.cpp b/engines/scumm/imuse/imuse.cpp index e604222733..1da6bdf627 100644 --- a/engines/scumm/imuse/imuse.cpp +++ b/engines/scumm/imuse/imuse.cpp @@ -23,7 +23,7 @@ * */ -#include "common/stdafx.h" + #include "base/version.h" diff --git a/engines/scumm/imuse/imuse_part.cpp b/engines/scumm/imuse/imuse_part.cpp index ffe572aaa9..c581f4ba3b 100644 --- a/engines/scumm/imuse/imuse_part.cpp +++ b/engines/scumm/imuse/imuse_part.cpp @@ -23,7 +23,7 @@ * */ -#include "common/stdafx.h" + #include "common/util.h" #include "scumm/imuse/imuse_internal.h" @@ -232,7 +232,7 @@ void Part::noteOn(byte note, byte velocity) { mc = _player->getMidiDriver()->getPercussionChannel(); if (!mc) return; - + // FIXME: The following is evil, EVIL!!! Either prev_vol_eff is // actually meant to be a member of the Part class (i.e. each // instance of Part keeps a separate copy of it); or it really diff --git a/engines/scumm/imuse/imuse_player.cpp b/engines/scumm/imuse/imuse_player.cpp index b6ed9f8d25..253bd919c6 100644 --- a/engines/scumm/imuse/imuse_player.cpp +++ b/engines/scumm/imuse/imuse_player.cpp @@ -22,7 +22,7 @@ * $Id$ */ -#include "common/stdafx.h" + #include "common/util.h" #include "engines/engine.h" diff --git a/engines/scumm/imuse/instrument.cpp b/engines/scumm/imuse/instrument.cpp index b6ed064bc9..cadafd412a 100644 --- a/engines/scumm/imuse/instrument.cpp +++ b/engines/scumm/imuse/instrument.cpp @@ -22,7 +22,7 @@ * $Id$ */ -#include "common/stdafx.h" + #include "scumm/scumm.h" #include "scumm/saveload.h" #include "scumm/imuse/instrument.h" diff --git a/engines/scumm/imuse/instrument.h b/engines/scumm/imuse/instrument.h index e8914e899e..4d4e40c528 100644 --- a/engines/scumm/imuse/instrument.h +++ b/engines/scumm/imuse/instrument.h @@ -25,7 +25,7 @@ #ifndef SCUMM_IMUSE_INSTRUMENT_H #define SCUMM_IMUSE_INSTRUMENT_H -#include "common/stdafx.h" + #include "common/scummsys.h" class MidiChannel; diff --git a/engines/scumm/imuse/sysex.h b/engines/scumm/imuse/sysex.h index adffc24e88..bff80de9e7 100644 --- a/engines/scumm/imuse/sysex.h +++ b/engines/scumm/imuse/sysex.h @@ -25,7 +25,7 @@ #ifndef SCUMM_IMUSE_SYSEX_H #define SCUMM_IMUSE_SYSEX_H -#include "common/stdafx.h" + #include "common/util.h" namespace Scumm { diff --git a/engines/scumm/imuse/sysex_samnmax.cpp b/engines/scumm/imuse/sysex_samnmax.cpp index 0586db25ee..cdae767abf 100644 --- a/engines/scumm/imuse/sysex_samnmax.cpp +++ b/engines/scumm/imuse/sysex_samnmax.cpp @@ -22,7 +22,7 @@ * $Id$ */ -#include "common/stdafx.h" + #include "common/endian.h" #include "common/util.h" diff --git a/engines/scumm/imuse/sysex_scumm.cpp b/engines/scumm/imuse/sysex_scumm.cpp index bee790e009..87873d1693 100644 --- a/engines/scumm/imuse/sysex_scumm.cpp +++ b/engines/scumm/imuse/sysex_scumm.cpp @@ -22,7 +22,7 @@ * $Id$ */ -#include "common/stdafx.h" + #include "common/endian.h" #include "common/util.h" |