[Scummvm-cvs-logs] CVS: scummvm-new/scumm/smush brenderer.h,1.2,1.3 player.cpp,1.7,1.8 player.h,1.3,1.4 renderer.h,1.2,1.3 scumm_renderer.cpp,1.2,1.3 scumm_renderer.h,1.4,1.5

Max Horn fingolfin at users.sourceforge.net
Sun Aug 25 15:55:02 CEST 2002


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

Modified Files:
	brenderer.h player.cpp player.h renderer.h scumm_renderer.cpp 
	scumm_renderer.h 
Log Message:
trying to reduce file interdependencies a bit

Index: brenderer.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm-new/scumm/smush/brenderer.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- brenderer.h	24 Aug 2002 23:21:55 -0000	1.2
+++ brenderer.h	25 Aug 2002 22:54:38 -0000	1.3
@@ -26,7 +26,6 @@
 
 #include "renderer.h"
 #include "palette.h"
-#include "rect.h"
 
 /*! 	@brief base class for easily creating ::renderer instances
 

Index: player.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm-new/scumm/smush/player.cpp,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- player.cpp	25 Aug 2002 22:25:18 -0000	1.7
+++ player.cpp	25 Aug 2002 22:54:38 -0000	1.8
@@ -23,7 +23,9 @@
 #include "common/util.h"
 #include "player.h"
 
+#include "mixer.h"
 #include "renderer.h"
+#include "frenderer.h"
 #include "channel.h"
 #include "chunk_type.h"
 #include "rect.h"
@@ -107,7 +109,7 @@
 			value[data_end - data_start] = 0;
 			char * line_start = value;
 			char * line_end;
-			while (line_end = strchr(line_start, '\n')) {
+			while ((line_end = strchr(line_start, '\n'))) {
 				line_start = line_end+1;
 				if (line_start[0] == '/' && line_start[1] == '/') {
 					line_start += 2;

Index: player.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm-new/scumm/smush/player.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- player.h	24 Aug 2002 23:21:55 -0000	1.3
+++ player.h	25 Aug 2002 22:54:38 -0000	1.4
@@ -25,17 +25,16 @@
 #include "config.h"
 
 #include "rect.h"
-#include "mixer.h"
 #include "chunk.h"
 #include "palette.h"
 #include "codec1.h"
 #include "codec37.h"
 #include "codec44.h"
 #include "codec47.h"
-#include "frenderer.h"
 
+class FontRenderer;
+class Mixer;
 class Renderer;
-
 class StringResource;
 
 /*!	@brief the SMUSH player class

Index: renderer.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm-new/scumm/smush/renderer.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- renderer.h	24 Aug 2002 23:21:55 -0000	1.2
+++ renderer.h	25 Aug 2002 22:54:38 -0000	1.3
@@ -24,9 +24,9 @@
 
 #include "config.h"
 
+#include "palette.h"
 #include "rect.h"
 
-class Palette;
 class Mixer;
 	
 /*! 	@brief interface for general output (rendering)

Index: scumm_renderer.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm-new/scumm/smush/scumm_renderer.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- scumm_renderer.cpp	25 Aug 2002 11:12:47 -0000	1.2
+++ scumm_renderer.cpp	25 Aug 2002 22:54:38 -0000	1.3
@@ -23,6 +23,7 @@
 #include "common/util.h"
 #include "scumm_renderer.h"
 #include "channel.h"
+#include "mixer.h"
 
 class scumm_mixer : public Mixer {
 private:

Index: scumm_renderer.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm-new/scumm/smush/scumm_renderer.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- scumm_renderer.h	25 Aug 2002 10:50:18 -0000	1.4
+++ scumm_renderer.h	25 Aug 2002 22:54:38 -0000	1.5
@@ -35,11 +35,10 @@
 #endif
 
 #include "brenderer.h"
-#include "mixer.h"
-#include "rect.h"
-#include "blitter.h"
 
 class scumm_mixer;
+class Scumm;
+class Mixer;
 
 class ScummRenderer : public BaseRenderer {
 private:





More information about the Scummvm-git-logs mailing list