[Scummvm-cvs-logs] CVS: scummvm/sword2/driver _mouse.cpp,1.31,1.32 animation.cpp,1.15,1.16 animation.h,1.15,1.16 d_draw.cpp,1.59,1.60 d_sound.cpp,1.105,1.106 menu.cpp,1.24,1.25 palette.cpp,1.28,1.29 rdwin.cpp,1.41,1.42 render.cpp,1.54,1.55 sprite.cpp,1.38,1.39

[Torbj?rn Andersson]

Update of /cvsroot/scummvm/scummvm/sword2/driver
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22174/driver

Modified Files:
	_mouse.cpp animation.cpp animation.h d_draw.cpp d_sound.cpp 
	menu.cpp palette.cpp rdwin.cpp render.cpp sprite.cpp 
Log Message:
Removed some of the #includes from sword2.h


Index: _mouse.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sword2/driver/_mouse.cpp,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -d -r1.31 -r1.32
--- _mouse.cpp	6 Jan 2004 13:44:17 -0000	1.31
+++ _mouse.cpp	5 Feb 2004 14:19:06 -0000	1.32
@@ -19,6 +19,7 @@
 
 #include "common/stdafx.h"
 #include "sword2/sword2.h"
+#include "sword2/driver/d_draw.h"
 
 namespace Sword2 {
 

Index: animation.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sword2/driver/animation.cpp,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- animation.cpp	30 Jan 2004 20:57:23 -0000	1.15
+++ animation.cpp	5 Feb 2004 14:19:06 -0000	1.16
@@ -21,7 +21,10 @@
 
 #include "common/stdafx.h"
 #include "sword2/sword2.h"
+#include "sword2/maketext.h"
 #include "sword2/driver/animation.h"
+#include "sword2/driver/d_draw.h"
+#include "sword2/driver/d_sound.h"
 #include "sword2/driver/menu.h"
 #include "sword2/driver/render.h"
 

Index: animation.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sword2/driver/animation.h,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- animation.h	30 Jan 2004 20:57:23 -0000	1.15
+++ animation.h	5 Feb 2004 14:19:06 -0000	1.16
@@ -22,6 +22,8 @@
 #ifndef ANIMATION_H
 #define ANIMATION_H
 
+#include "sound/mixer.h"
+
 // Uncomment this if you are using libmpeg2 0.3.1.
 // #define USE_MPEG2_0_3_1
 

Index: d_draw.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sword2/driver/d_draw.cpp,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -d -r1.59 -r1.60
--- d_draw.cpp	13 Jan 2004 10:09:53 -0000	1.59
+++ d_draw.cpp	5 Feb 2004 14:19:06 -0000	1.60
@@ -19,6 +19,7 @@
 
 #include "common/stdafx.h"
 #include "sword2/sword2.h"
+#include "sword2/driver/d_draw.h"
 #include "sword2/driver/menu.h"
 #include "sword2/driver/render.h"
 

Index: d_sound.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sword2/driver/d_sound.cpp,v
retrieving revision 1.105
retrieving revision 1.106
diff -u -d -r1.105 -r1.106
--- d_sound.cpp	29 Jan 2004 18:15:26 -0000	1.105
+++ d_sound.cpp	5 Feb 2004 14:19:06 -0000	1.106
@@ -34,8 +34,10 @@
 
 #include "common/stdafx.h"
 #include "common/file.h"
-#include "sword2/sword2.h"
 #include "sound/rate.h"
+#include "sword2/sword2.h"
+#include "sword2/driver/d_draw.h"
+#include "sword2/driver/d_sound.h"
 
 namespace Sword2 {
 

Index: menu.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sword2/driver/menu.cpp,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -d -r1.24 -r1.25
--- menu.cpp	6 Jan 2004 13:44:17 -0000	1.24
+++ menu.cpp	5 Feb 2004 14:19:07 -0000	1.25
@@ -19,6 +19,7 @@
 
 #include "common/stdafx.h"
 #include "sword2/sword2.h"
+#include "sword2/driver/d_draw.h"
 #include "sword2/driver/render.h"
 
 namespace Sword2 {

Index: palette.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sword2/driver/palette.cpp,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -d -r1.28 -r1.29
--- palette.cpp	6 Jan 2004 13:44:17 -0000	1.28
+++ palette.cpp	5 Feb 2004 14:19:07 -0000	1.29
@@ -18,9 +18,8 @@
  */
 
 #include "common/stdafx.h"
-// #include "common/util.h"
-// #include "base/engine.h"
 #include "sword2/sword2.h"
+#include "sword2/driver/d_draw.h"
 
 namespace Sword2 {
 

Index: rdwin.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sword2/driver/rdwin.cpp,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -d -r1.41 -r1.42
--- rdwin.cpp	6 Jan 2004 13:44:17 -0000	1.41
+++ rdwin.cpp	5 Feb 2004 14:19:07 -0000	1.42
@@ -19,6 +19,7 @@
 
 #include "common/stdafx.h"
 #include "sword2/sword2.h"
+#include "sword2/driver/d_draw.h"
 #include "sword2/driver/menu.h"
 
 namespace Sword2 {

Index: render.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sword2/driver/render.cpp,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -d -r1.54 -r1.55
--- render.cpp	17 Jan 2004 14:20:32 -0000	1.54
+++ render.cpp	5 Feb 2004 14:19:07 -0000	1.55
@@ -20,6 +20,7 @@
 #include "common/stdafx.h"
 #include "sword2/sword2.h"
 #include "sword2/driver/animation.h"
+#include "sword2/driver/d_draw.h"
 #include "sword2/driver/menu.h"
 #include "sword2/driver/render.h"
 

Index: sprite.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sword2/driver/sprite.cpp,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -d -r1.38 -r1.39
--- sprite.cpp	6 Jan 2004 13:44:17 -0000	1.38
+++ sprite.cpp	5 Feb 2004 14:19:07 -0000	1.39
@@ -19,6 +19,7 @@
 
 #include "common/stdafx.h"
 #include "sword2/sword2.h"
+#include "sword2/driver/d_draw.h"
 
 namespace Sword2 {