aboutsummaryrefslogtreecommitdiff
path: root/scumm/smush
diff options
context:
space:
mode:
authorMax Horn2003-09-10 12:31:20 +0000
committerMax Horn2003-09-10 12:31:20 +0000
commit07a9646997cca2fe2cdc22708e33bd08b61bb927 (patch)
treee4ee2fba33561c554e40123d33c761521745f81a /scumm/smush
parent925ddb1b8605a6659aef426ff0494c7ede8716c2 (diff)
downloadscummvm-rg350-07a9646997cca2fe2cdc22708e33bd08b61bb927.tar.gz
scummvm-rg350-07a9646997cca2fe2cdc22708e33bd08b61bb927.tar.bz2
scummvm-rg350-07a9646997cca2fe2cdc22708e33bd08b61bb927.zip
moved declaration of error/warning/debug from engine.h to util.h
svn-id: r10152
Diffstat (limited to 'scumm/smush')
-rw-r--r--scumm/smush/channel.h2
-rw-r--r--scumm/smush/chunk.cpp2
-rw-r--r--scumm/smush/codec37.cpp5
-rw-r--r--scumm/smush/codec47.cpp5
4 files changed, 6 insertions, 8 deletions
diff --git a/scumm/smush/channel.h b/scumm/smush/channel.h
index b0821ef6dc..6b9390d300 100644
--- a/scumm/smush/channel.h
+++ b/scumm/smush/channel.h
@@ -22,7 +22,7 @@
#ifndef SMUSH_CHANNEL_H
#define SMUSH_CHANNEL_H
-#include "common/engine.h"
+#include "common/util.h"
class Chunk;
class ContChunk;
diff --git a/scumm/smush/chunk.cpp b/scumm/smush/chunk.cpp
index bc0f95e42e..d737d41f49 100644
--- a/scumm/smush/chunk.cpp
+++ b/scumm/smush/chunk.cpp
@@ -22,9 +22,9 @@
#include "stdafx.h"
#include "chunk.h"
-#include "common/engine.h"
#include "common/file.h"
#include "common/str.h"
+#include "common/util.h"
class FilePtr : public File {
ScummVM::String _filename;
diff --git a/scumm/smush/codec37.cpp b/scumm/smush/codec37.cpp
index 64154747ad..c2fa816045 100644
--- a/scumm/smush/codec37.cpp
+++ b/scumm/smush/codec37.cpp
@@ -20,10 +20,9 @@
*/
#include "stdafx.h"
-#include "codec37.h"
+#include "common/util.h"
#include "scumm/bomp.h"
-
-#include "common/engine.h"
+#include "scumm/smush/codec37.h"
void Codec37Decoder::init(int width, int height) {
deinit();
diff --git a/scumm/smush/codec47.cpp b/scumm/smush/codec47.cpp
index de97ee8cd1..869e156444 100644
--- a/scumm/smush/codec47.cpp
+++ b/scumm/smush/codec47.cpp
@@ -20,10 +20,9 @@
*/
#include "stdafx.h"
-#include "codec47.h"
+#include "common/util.h"
#include "scumm/bomp.h"
-
-#include "common/engine.h"
+#include "scumm/smush/codec47.h"
#if defined(SCUMM_NEED_ALIGNMENT)