[Scummvm-cvs-logs] CVS: scummvm/scumm/smush channel.h,1.11,1.12 codec37.cpp,1.22,1.23 codec47.cpp,1.59,1.60

[Max Horn]

Update of /cvsroot/scummvm/scummvm/scumm/smush
In directory sc8-pr-cvs1:/tmp/cvs-serv15733

Modified Files:
	channel.h codec37.cpp codec47.cpp 
Log Message:
moved declaration of error/warning/debug from engine.h to util.h

Index: channel.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/smush/channel.h,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- channel.h	21 Jun 2003 20:57:00 -0000	1.11
+++ channel.h	10 Sep 2003 12:31:20 -0000	1.12
@@ -22,7 +22,7 @@
 #ifndef SMUSH_CHANNEL_H
 #define SMUSH_CHANNEL_H
 
-#include "common/engine.h"
+#include "common/util.h"
 
 class Chunk;
 class ContChunk;

Index: codec37.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/smush/codec37.cpp,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -d -r1.22 -r1.23
--- codec37.cpp	7 Jun 2003 00:45:32 -0000	1.22
+++ codec37.cpp	10 Sep 2003 12:31:20 -0000	1.23
@@ -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();

Index: codec47.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/smush/codec47.cpp,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -d -r1.59 -r1.60
--- codec47.cpp	18 Aug 2003 12:53:26 -0000	1.59
+++ codec47.cpp	10 Sep 2003 12:31:20 -0000	1.60
@@ -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)