aboutsummaryrefslogtreecommitdiff
path: root/scumm/sound.cpp
diff options
context:
space:
mode:
authorMax Horn2003-06-15 01:42:19 +0000
committerMax Horn2003-06-15 01:42:19 +0000
commit101df28e0b196201ab924cdbb771ba95426ff42d (patch)
tree6453d3321cbb2bc3a4b0e9403a6954d94bb829d5 /scumm/sound.cpp
parent9ce9ce620f5210e4293c7c0452509d48fecd0b69 (diff)
downloadscummvm-rg350-101df28e0b196201ab924cdbb771ba95426ff42d.tar.gz
scummvm-rg350-101df28e0b196201ab924cdbb771ba95426ff42d.tar.bz2
scummvm-rg350-101df28e0b196201ab924cdbb771ba95426ff42d.zip
moved GameId declaration to common/engine.h (more logical); moved scumm specific stuff from gameDetector.h to scumm.h; cleaned up some #includes (ideally, never #include something in a header file if you can avoid it - this cuts down interdepencies)
svn-id: r8496
Diffstat (limited to 'scumm/sound.cpp')
-rw-r--r--scumm/sound.cpp11
1 files changed, 6 insertions, 5 deletions
diff --git a/scumm/sound.cpp b/scumm/sound.cpp
index 78bd0b1b39..62d3bd1242 100644
--- a/scumm/sound.cpp
+++ b/scumm/sound.cpp
@@ -21,16 +21,17 @@
*/
#include "stdafx.h"
+#include "actor.h"
+#include "bundle.h"
+#include "imuse.h"
+#include "imuse_digi.h"
+#include "player_v2.h"
#include "scumm.h"
#include "sound.h"
#include "sound/mididrv.h"
#include "sound/mixer.h"
-#include "imuse.h"
-#include "imuse_digi.h"
-#include "player_v2.h"
-#include "actor.h"
-#include "bundle.h"
#include "common/config-file.h"
+#include "common/timer.h"
#include "common/util.h"
#include "sound/midiparser.h"