aboutsummaryrefslogtreecommitdiff
path: root/scumm/smush
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/smush
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/smush')
-rw-r--r--scumm/smush/smush_player.cpp8
1 files changed, 5 insertions, 3 deletions
diff --git a/scumm/smush/smush_player.cpp b/scumm/smush/smush_player.cpp
index f20d007221..3b58d681d2 100644
--- a/scumm/smush/smush_player.cpp
+++ b/scumm/smush/smush_player.cpp
@@ -20,9 +20,6 @@
*/
#include "stdafx.h"
-#include "common/file.h"
-#include "common/util.h"
-#include "common/engine.h"
#include "scumm/scumm.h"
#include "scumm/bomp.h"
#include "scumm/sound.h"
@@ -36,6 +33,11 @@
#include "chunk.h"
#include "chunk_type.h"
+#include "common/engine.h"
+#include "common/file.h"
+#include "common/util.h"
+#include "common/timer.h"
+
const int MAX_STRINGS = 200;
class StringResource {