[Scummvm-cvs-logs] CVS: scummvm/sword2/driver _mouse.cpp,1.41,1.42 animation.cpp,1.54,1.55 d_draw.cpp,1.66,1.67 d_sound.cpp,1.143,1.144 menu.cpp,1.33,1.34 rdwin.cpp,1.52,1.53 render.cpp,1.71,1.72 sprite.cpp,1.47,1.48 driver96.h,1.76,NONE menu.h,1.6,NONE render.h,1.16,NONE

[Torbjörn Andersson]

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

Modified Files:
	_mouse.cpp animation.cpp d_draw.cpp d_sound.cpp menu.cpp 
	rdwin.cpp render.cpp sprite.cpp 
Removed Files:
	driver96.h menu.h render.h 
Log Message:
Got rid of all the .h files but one in the 'driver' directory. They were
either very small or, in the case of driver96.h, a disorganized jumbles.


Index: _mouse.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sword2/driver/_mouse.cpp,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -d -r1.41 -r1.42
--- _mouse.cpp	19 Feb 2005 14:02:14 -0000	1.41
+++ _mouse.cpp	27 Feb 2005 16:11:17 -0000	1.42
@@ -22,6 +22,7 @@
 #include "common/system.h"
 
 #include "sword2/sword2.h"
+#include "sword2/defs.h"
 #include "sword2/mouse.h"
 
 namespace Sword2 {

Index: animation.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sword2/driver/animation.cpp,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -d -r1.54 -r1.55
--- animation.cpp	19 Feb 2005 14:02:14 -0000	1.54
+++ animation.cpp	27 Feb 2005 16:11:17 -0000	1.55
@@ -27,12 +27,11 @@
 #include "sound/mp3.h"
 
 #include "sword2/sword2.h"
+#include "sword2/defs.h"
 #include "sword2/maketext.h"
 #include "sword2/resman.h"
 #include "sword2/sound.h"
 #include "sword2/driver/animation.h"
-#include "sword2/driver/menu.h"
-#include "sword2/driver/render.h"
 
 namespace Sword2 {
 
@@ -415,7 +414,7 @@
 	byte *msgSurface;
 
 	msgSprite.x = _vm->_screen->getScreenWide() / 2 - frame->width / 2;
-	msgSprite.y = RDMENU_MENUDEEP / 2 - frame->height / 2;
+	msgSprite.y = MENUDEEP / 2 - frame->height / 2;
 	msgSprite.w = frame->width;
 	msgSprite.h = frame->height;
 	msgSprite.type = RDSPR_NOCOMPRESSION;

Index: d_draw.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sword2/driver/d_draw.cpp,v
retrieving revision 1.66
retrieving revision 1.67
diff -u -d -r1.66 -r1.67
--- d_draw.cpp	19 Feb 2005 14:02:15 -0000	1.66
+++ d_draw.cpp	27 Feb 2005 16:11:18 -0000	1.67
@@ -21,8 +21,7 @@
 #include "common/stdafx.h"
 #include "common/system.h"
 #include "sword2/sword2.h"
-#include "sword2/driver/menu.h"
-#include "sword2/driver/render.h"
+#include "sword2/mouse.h"
 
 namespace Sword2 {
 

Index: d_sound.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sword2/driver/d_sound.cpp,v
retrieving revision 1.143
retrieving revision 1.144
diff -u -d -r1.143 -r1.144
--- d_sound.cpp	21 Feb 2005 08:35:17 -0000	1.143
+++ d_sound.cpp	27 Feb 2005 16:11:18 -0000	1.144
@@ -32,7 +32,9 @@
 #include "sound/flac.h"
 #include "sound/rate.h"
 #include "sound/wave.h"
+
 #include "sword2/sword2.h"
+#include "sword2/defs.h"
 #include "sword2/resman.h"
 #include "sword2/sound.h"
 

Index: menu.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sword2/driver/menu.cpp,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -d -r1.33 -r1.34
--- menu.cpp	19 Feb 2005 14:02:16 -0000	1.33
+++ menu.cpp	27 Feb 2005 16:11:18 -0000	1.34
@@ -19,9 +19,10 @@
  */
 
 #include "common/stdafx.h"
+
 #include "sword2/sword2.h"
+#include "sword2/defs.h"
 #include "sword2/mouse.h"
-#include "sword2/driver/render.h"
 
 namespace Sword2 {
 

Index: rdwin.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sword2/driver/rdwin.cpp,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -d -r1.52 -r1.53
--- rdwin.cpp	19 Feb 2005 14:02:16 -0000	1.52
+++ rdwin.cpp	27 Feb 2005 16:11:18 -0000	1.53
@@ -21,7 +21,6 @@
 #include "common/stdafx.h"
 #include "common/system.h"
 #include "sword2/sword2.h"
-#include "sword2/driver/menu.h"
 
 namespace Sword2 {
 

Index: render.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sword2/driver/render.cpp,v
retrieving revision 1.71
retrieving revision 1.72
diff -u -d -r1.71 -r1.72
--- render.cpp	19 Feb 2005 14:02:16 -0000	1.71
+++ render.cpp	27 Feb 2005 16:11:19 -0000	1.72
@@ -20,11 +20,11 @@
 
 #include "common/stdafx.h"
 #include "common/system.h"
+
 #include "sword2/sword2.h"
+#include "sword2/defs.h"
 #include "sword2/build_display.h"
 #include "sword2/driver/animation.h"
-#include "sword2/driver/menu.h"
-#include "sword2/driver/render.h"
 
 namespace Sword2 {
 

Index: sprite.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sword2/driver/sprite.cpp,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -d -r1.47 -r1.48
--- sprite.cpp	19 Feb 2005 14:02:16 -0000	1.47
+++ sprite.cpp	27 Feb 2005 16:11:19 -0000	1.48
@@ -19,7 +19,9 @@
  */
 
 #include "common/stdafx.h"
+
 #include "sword2/sword2.h"
+#include "sword2/defs.h"
 #include "sword2/build_display.h"
 
 namespace Sword2 {

--- driver96.h DELETED ---

--- menu.h DELETED ---

--- render.h DELETED ---