aboutsummaryrefslogtreecommitdiff
path: root/engines/scumm/imuse_digi
diff options
context:
space:
mode:
authorNicola Mettifogo2007-09-19 08:40:12 +0000
committerNicola Mettifogo2007-09-19 08:40:12 +0000
commit258901bab96f0050385a9912c8ea0fe2a41b2d6f (patch)
treea3ae8675b679c9f3b58ac8d97c79369502ea23c1 /engines/scumm/imuse_digi
parenta89694c0d61a75a960f5bec6c498659c988401cc (diff)
downloadscummvm-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_digi')
-rw-r--r--engines/scumm/imuse_digi/dimuse.cpp2
-rw-r--r--engines/scumm/imuse_digi/dimuse_bndmgr.cpp2
-rw-r--r--engines/scumm/imuse_digi/dimuse_codecs.cpp2
-rw-r--r--engines/scumm/imuse_digi/dimuse_music.cpp2
-rw-r--r--engines/scumm/imuse_digi/dimuse_script.cpp4
-rw-r--r--engines/scumm/imuse_digi/dimuse_sndmgr.cpp2
-rw-r--r--engines/scumm/imuse_digi/dimuse_sndmgr.h2
-rw-r--r--engines/scumm/imuse_digi/dimuse_tables.cpp2
-rw-r--r--engines/scumm/imuse_digi/dimuse_track.cpp4
9 files changed, 11 insertions, 11 deletions
diff --git a/engines/scumm/imuse_digi/dimuse.cpp b/engines/scumm/imuse_digi/dimuse.cpp
index 6d2e7dd217..776b840145 100644
--- a/engines/scumm/imuse_digi/dimuse.cpp
+++ b/engines/scumm/imuse_digi/dimuse.cpp
@@ -22,7 +22,7 @@
* $Id$
*/
-#include "common/stdafx.h"
+
#include "common/system.h"
#include "common/timer.h"
diff --git a/engines/scumm/imuse_digi/dimuse_bndmgr.cpp b/engines/scumm/imuse_digi/dimuse_bndmgr.cpp
index 03b3e4e74a..f0b4bc131b 100644
--- a/engines/scumm/imuse_digi/dimuse_bndmgr.cpp
+++ b/engines/scumm/imuse_digi/dimuse_bndmgr.cpp
@@ -22,7 +22,7 @@
* $Id$
*/
-#include "common/stdafx.h"
+
#include "common/scummsys.h"
#include "scumm/scumm.h"
#include "scumm/util.h"
diff --git a/engines/scumm/imuse_digi/dimuse_codecs.cpp b/engines/scumm/imuse_digi/dimuse_codecs.cpp
index b79c7111f9..8ff8bd2461 100644
--- a/engines/scumm/imuse_digi/dimuse_codecs.cpp
+++ b/engines/scumm/imuse_digi/dimuse_codecs.cpp
@@ -22,7 +22,7 @@
* $Id$
*/
-#include "common/stdafx.h"
+
#include "common/scummsys.h"
#include "common/endian.h"
#include "common/util.h"
diff --git a/engines/scumm/imuse_digi/dimuse_music.cpp b/engines/scumm/imuse_digi/dimuse_music.cpp
index bdfc4bf4fa..af4966b2ff 100644
--- a/engines/scumm/imuse_digi/dimuse_music.cpp
+++ b/engines/scumm/imuse_digi/dimuse_music.cpp
@@ -22,7 +22,7 @@
* $Id$
*/
-#include "common/stdafx.h"
+
#include "common/scummsys.h"
#include "scumm/scumm.h"
#include "scumm/imuse_digi/dimuse.h"
diff --git a/engines/scumm/imuse_digi/dimuse_script.cpp b/engines/scumm/imuse_digi/dimuse_script.cpp
index ddc0cd5107..0895be540b 100644
--- a/engines/scumm/imuse_digi/dimuse_script.cpp
+++ b/engines/scumm/imuse_digi/dimuse_script.cpp
@@ -22,7 +22,7 @@
* $Id$
*/
-#include "common/stdafx.h"
+
#include "common/system.h"
#include "common/timer.h"
@@ -403,7 +403,7 @@ void IMuseDigital::stopAllSounds() {
delete track->streamSou;
track->streamSou = NULL;
}
-
+
// Mark the track as unused
track->used = false;
}
diff --git a/engines/scumm/imuse_digi/dimuse_sndmgr.cpp b/engines/scumm/imuse_digi/dimuse_sndmgr.cpp
index be80cb73e8..51f5c76815 100644
--- a/engines/scumm/imuse_digi/dimuse_sndmgr.cpp
+++ b/engines/scumm/imuse_digi/dimuse_sndmgr.cpp
@@ -22,7 +22,7 @@
* $Id$
*/
-#include "common/stdafx.h"
+
#include "common/scummsys.h"
#include "common/util.h"
diff --git a/engines/scumm/imuse_digi/dimuse_sndmgr.h b/engines/scumm/imuse_digi/dimuse_sndmgr.h
index e4e2e795a2..f38589df3d 100644
--- a/engines/scumm/imuse_digi/dimuse_sndmgr.h
+++ b/engines/scumm/imuse_digi/dimuse_sndmgr.h
@@ -25,7 +25,7 @@
#ifndef SCUMM_IMUSE_DIGI_SNDMGR_H
#define SCUMM_IMUSE_DIGI_SNDMGR_H
-#include "common/stdafx.h"
+
#include "common/scummsys.h"
#include "sound/audiostream.h"
#include "scumm/imuse_digi/dimuse_bndmgr.h"
diff --git a/engines/scumm/imuse_digi/dimuse_tables.cpp b/engines/scumm/imuse_digi/dimuse_tables.cpp
index 9c56063557..e190e5a755 100644
--- a/engines/scumm/imuse_digi/dimuse_tables.cpp
+++ b/engines/scumm/imuse_digi/dimuse_tables.cpp
@@ -22,7 +22,7 @@
* $Id$
*/
-#include "common/stdafx.h"
+
#include "scumm/imuse_digi/dimuse.h"
namespace Scumm {
diff --git a/engines/scumm/imuse_digi/dimuse_track.cpp b/engines/scumm/imuse_digi/dimuse_track.cpp
index 987e1bc3c9..86570f478d 100644
--- a/engines/scumm/imuse_digi/dimuse_track.cpp
+++ b/engines/scumm/imuse_digi/dimuse_track.cpp
@@ -22,7 +22,7 @@
* $Id$
*/
-#include "common/stdafx.h"
+
#include "common/timer.h"
#include "scumm/actor.h"
@@ -321,7 +321,7 @@ IMuseDigital::Track *IMuseDigital::cloneToFadeOutTrack(const Track *track, int f
}
fadeTrack = _track[track->trackId + MAX_DIGITAL_TRACKS];
-
+
// Clone the settings of the given track
memcpy(fadeTrack, track, sizeof(Track));