[Scummvm-cvs-logs] CVS: scummvm/sword2/driver animation.cpp,1.5,1.6 animation.h,1.7,1.8 d_draw.h,1.24,1.25 render.cpp,1.51,1.52

[Max Horn]

Update of /cvsroot/scummvm/scummvm/sword2/driver
In directory sc8-pr-cvs1:/tmp/cvs-serv17043/driver

Modified Files:
	animation.cpp animation.h d_draw.h render.cpp 
Log Message:
cut down pointless header interdependencies

Index: animation.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sword2/driver/animation.cpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- animation.cpp	13 Jan 2004 14:16:40 -0000	1.5
+++ animation.cpp	13 Jan 2004 14:22:29 -0000	1.6
@@ -21,9 +21,11 @@
 
 #include "common/stdafx.h"
 #include "sword2/sword2.h"
+#include "sword2/driver/animation.h"
 #include "sword2/driver/menu.h"
 #include "sword2/driver/render.h"
 
+
 #include "common/file.h"
 
 namespace Sword2 {

Index: animation.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sword2/driver/animation.h,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- animation.h	13 Jan 2004 14:16:40 -0000	1.7
+++ animation.h	13 Jan 2004 14:22:29 -0000	1.8
@@ -97,10 +97,11 @@
 	void closeTextObject(MovieTextObject *obj);
 	void drawTextObject(MovieTextObject *obj);
 
+	int32 playDummy(const char *filename, MovieTextObject *text[], uint8 *musicOut);
+
 public:
 	MoviePlayer(Sword2Engine *vm) : _vm(vm), _textSurface(NULL) {}
 	int32 play(const char *filename, MovieTextObject *text[], uint8 *musicOut);
-	int32 playDummy(const char *filename, MovieTextObject *text[], uint8 *musicOut);
 };
 
 } // End of namespace Sword2

Index: d_draw.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sword2/driver/d_draw.h,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -d -r1.24 -r1.25
--- d_draw.h	13 Jan 2004 10:09:53 -0000	1.24
+++ d_draw.h	13 Jan 2004 14:22:29 -0000	1.25
@@ -22,8 +22,6 @@
 
 #include "common/rect.h"
 
-#include "animation.h"
-
 namespace Sword2 {
 
 // This is the maximum mouse cursor size in the SDL backend

Index: render.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sword2/driver/render.cpp,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -d -r1.51 -r1.52
--- render.cpp	13 Jan 2004 10:27:13 -0000	1.51
+++ render.cpp	13 Jan 2004 14:22:29 -0000	1.52
@@ -19,6 +19,7 @@
 
 #include "common/stdafx.h"
 #include "sword2/sword2.h"
+#include "sword2/driver/animation.h"
 #include "sword2/driver/menu.h"
 #include "sword2/driver/render.h"