[Scummvm-cvs-logs] CVS: scummvm/scumm/smush blitter.h,1.4,1.5 brenderer.cpp,1.2,1.3 channel.h,1.4,1.5 chunk.cpp,1.4,1.5 codec37.cpp,1.5,1.6 config.h,1.4,1.5 decoder.h,1.3,1.4 frenderer.cpp,1.5,1.6 frenderer.h,1.4,1.5 player.cpp,1.10,1.11 player.h,1.5,1.6 renderer.h,1.4,1.5 saud_channel.cpp,1.6,1.7 scumm_renderer.cpp,1.5,1.6 rect.h,1.6,NONE

Max Horn fingolfin at users.sourceforge.net
Sat Aug 31 06:30:02 CEST 2002


Update of /cvsroot/scummvm/scummvm/scumm/smush
In directory usw-pr-cvs1:/tmp/cvs-serv24010/scumm/smush

Modified Files:
	blitter.h brenderer.cpp channel.h chunk.cpp codec37.cpp 
	config.h decoder.h frenderer.cpp frenderer.h player.cpp 
	player.h renderer.h saud_channel.cpp scumm_renderer.cpp 
Removed Files:
	rect.h 
Log Message:
fixed compilation on Mac OS X; some cleanup; moved header file scumm/smusH/rect.h to common/rect.h

Index: blitter.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/smush/blitter.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- blitter.h	30 Aug 2002 07:24:45 -0000	1.4
+++ blitter.h	31 Aug 2002 13:29:09 -0000	1.5
@@ -34,7 +34,10 @@
 # endif
 #endif
 
-#include "rect.h"
+#include "common/rect.h"
+
+using ScummVM::Point;
+using ScummVM::Rect;
 
 class Chunk;
 /*! 	@brief class for handling blitting on a frame buffer

Index: brenderer.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/smush/brenderer.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- brenderer.cpp	30 Aug 2002 07:24:45 -0000	1.2
+++ brenderer.cpp	31 Aug 2002 13:29:09 -0000	1.3
@@ -22,6 +22,8 @@
 #include <stdafx.h>
 #include "brenderer.h"
 
+#include "common/engine.h" // for debug, warning, error
+
 #include <assert.h>
 
 void BaseRenderer::clean() {

Index: channel.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/smush/channel.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- channel.h	30 Aug 2002 07:24:45 -0000	1.4
+++ channel.h	31 Aug 2002 13:29:09 -0000	1.5
@@ -23,6 +23,7 @@
 #define CHANNEL_H
 
 #include "config.h"
+#include "common/engine.h" // for debug, warning, error
 
 #ifdef DEBUG
 # ifndef NO_DEBUG_CHANNEL

Index: chunk.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/smush/chunk.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- chunk.cpp	30 Aug 2002 07:24:45 -0000	1.4
+++ chunk.cpp	31 Aug 2002 13:29:10 -0000	1.5
@@ -22,6 +22,8 @@
 #include <stdafx.h>
 #include "chunk.h"
 
+#include "common/engine.h" // for debug, warning, error
+
 #include <stdio.h> // for FILE, fopen, fclose, fseek and ftell
 #include <string.h> // for memcpy
 

Index: codec37.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/smush/codec37.cpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- codec37.cpp	30 Aug 2002 07:24:45 -0000	1.5
+++ codec37.cpp	31 Aug 2002 13:29:10 -0000	1.6
@@ -24,6 +24,8 @@
 #include "chunk.h"
 #include "blitter.h"
 
+#include "common/engine.h" // for debug, warning, error
+
 #include <assert.h>
 #include <string.h>
 

Index: config.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/smush/config.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- config.h	30 Aug 2002 15:24:16 -0000	1.4
+++ config.h	31 Aug 2002 13:29:10 -0000	1.5
@@ -23,7 +23,7 @@
 #define SMUSH_CONFIG_H
 
 #include <stdafx.h>
-#include <scumm.h>
+#include <scummsys.h>
 
 #ifndef NDEBUG
 #define DEBUG

Index: decoder.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/smush/decoder.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- decoder.h	24 Aug 2002 23:21:55 -0000	1.3
+++ decoder.h	31 Aug 2002 13:29:10 -0000	1.4
@@ -24,8 +24,10 @@
 
 #include "config.h"
 
-#include "rect.h"
+#include "common/rect.h"
 
+using ScummVM::Point;
+using ScummVM::Rect;
 class Blitter;
 class Chunk;
 

Index: frenderer.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/smush/frenderer.cpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- frenderer.cpp	30 Aug 2002 15:24:16 -0000	1.5
+++ frenderer.cpp	31 Aug 2002 13:29:10 -0000	1.6
@@ -21,9 +21,9 @@
 
 #include <stdafx.h>
 #include "common/util.h"
+#include "common/engine.h" // for debug, warning, error
 
 #include "frenderer.h"
-#include "rect.h"
 
 #include <assert.h>
 #include <string.h>

Index: frenderer.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/smush/frenderer.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- frenderer.h	30 Aug 2002 07:24:45 -0000	1.4
+++ frenderer.h	31 Aug 2002 13:29:10 -0000	1.5
@@ -35,7 +35,7 @@
 #endif
 
 #include "brenderer.h"
-#include "rect.h"
+#include "common/util.h"
 #include "blitter.h"
 
 /*!	@brief ::renderer implementation specifically designed for font files.

Index: player.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/smush/player.cpp,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- player.cpp	30 Aug 2002 15:24:16 -0000	1.10
+++ player.cpp	31 Aug 2002 13:29:10 -0000	1.11
@@ -21,6 +21,8 @@
 
 #include <stdafx.h>
 #include "common/util.h"
+#include "common/engine.h" // for debug, warning, error
+
 #include "player.h"
 
 #include "mixer.h"
@@ -28,7 +30,6 @@
 #include "frenderer.h"
 #include "channel.h"
 #include "chunk_type.h"
-#include "rect.h"
 #include "blitter.h"
 
 #include <assert.h>

Index: player.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/smush/player.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- player.h	30 Aug 2002 07:24:45 -0000	1.5
+++ player.h	31 Aug 2002 13:29:10 -0000	1.6
@@ -24,7 +24,7 @@
 
 #include "config.h"
 
-#include "rect.h"
+#include "common/util.h"
 #include "chunk.h"
 #include "palette.h"
 #include "codec1.h"

Index: renderer.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/smush/renderer.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- renderer.h	30 Aug 2002 07:24:45 -0000	1.4
+++ renderer.h	31 Aug 2002 13:29:10 -0000	1.5
@@ -25,8 +25,10 @@
 #include "config.h"
 
 #include "palette.h"
-#include "rect.h"
+#include "common/rect.h"
 
+using ScummVM::Point;
+using ScummVM::Rect;
 class Mixer;
 	
 /*! 	@brief interface for general output (rendering)

Index: saud_channel.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/smush/saud_channel.cpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- saud_channel.cpp	30 Aug 2002 07:24:45 -0000	1.6
+++ saud_channel.cpp	31 Aug 2002 13:29:10 -0000	1.7
@@ -20,6 +20,7 @@
  */
 
 #include <stdafx.h>
+
 #include "channel.h"
 #include "chunk.h"
 #include "chunk_type.h"

Index: scumm_renderer.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/smush/scumm_renderer.cpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- scumm_renderer.cpp	30 Aug 2002 07:24:45 -0000	1.5
+++ scumm_renderer.cpp	31 Aug 2002 13:29:10 -0000	1.6
@@ -25,6 +25,7 @@
 #include "channel.h"
 #include "mixer.h"
 #include "sound/mixer.h"
+#include "scumm/scumm.h"
 #include "scumm/sound.h"
 
 class scumm_mixer : public Mixer {

--- rect.h DELETED ---





More information about the Scummvm-git-logs mailing list