[Scummvm-cvs-logs] CVS: scummvm/bs2/driver _console.cpp,1.7,1.8 _console.h,1.3,1.4 d_draw.cpp,1.34,1.35 d_sound.cpp,1.71,1.72 driver96.h,1.51,1.52 keyboard.h,1.5,1.6 menu.cpp,1.16,1.17 menu.h,1.2,1.3 palette.cpp,1.19,1.20 palette.h,1.5,1.6 rdwin.cpp,1.30,1.31 render.h,1.8,1.9 sprite.cpp,1.27,1.28

[Torbj?rn Andersson]

Update of /cvsroot/scummvm/scummvm/bs2/driver
In directory sc8-pr-cvs1:/tmp/cvs-serv21172/driver

Modified Files:
	_console.cpp _console.h d_draw.cpp d_sound.cpp driver96.h 
	keyboard.h menu.cpp menu.h palette.cpp palette.h rdwin.cpp 
	render.h sprite.cpp 
Log Message:
Changed to use #include "bs2/..." and removed the inclusion of standard C
headers. Most (all?) of the ones we need should probably come from stdafx.h
instead.


Index: _console.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/bs2/driver/_console.cpp,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- _console.cpp	4 Oct 2003 00:52:26 -0000	1.7
+++ _console.cpp	4 Oct 2003 08:07:03 -0000	1.8
@@ -43,14 +43,9 @@
 //
 //=============================================================================
 
-
-//#include "ddraw.h"
-
 #include "stdafx.h"
 #include "bs2/driver/driver96.h"
-
 #include "bs2/driver/d_draw.h"
-
 
 namespace Sword2 {
 

Index: _console.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/bs2/driver/_console.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- _console.h	4 Oct 2003 00:52:26 -0000	1.3
+++ _console.h	4 Oct 2003 08:07:03 -0000	1.4
@@ -17,19 +17,6 @@
  * $Header$
  */
 
-//=============================================================================
-//
-//	Filename	:	console.h
-//	Created		:	19th September 1996
-//	By			:	P.R.Porter
-//
-//	Summary		:	This include file defines links to all data which is
-//					defined in the console.c module, but can be accessed by
-//					other parts of the driver96 library.
-//
-//=============================================================================
-
-
 #ifndef DRIVER_CONSOLE_H
 #define DRIVER_CONSOLE_H
 
@@ -38,6 +25,5 @@
 extern void DisplayConsole(void);
 
 } // End of namespace Sword2
-
 
 #endif

Index: d_draw.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/bs2/driver/d_draw.cpp,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -d -r1.34 -r1.35
--- d_draw.cpp	4 Oct 2003 00:52:26 -0000	1.34
+++ d_draw.cpp	4 Oct 2003 08:07:03 -0000	1.35
@@ -17,17 +17,16 @@
  * $Header$
  */
 
-#include <stdio.h>
 #include "stdafx.h"
-#include "bs2/driver/driver96.h"
-#include "bs2/header.h"		// HACK: For cutscenes instruction message
-#include "bs2/maketext.h"	// HACK: For cutscenes instruction message
-#include "bs2/sword2.h"
 #include "sound/mixer.h"
+#include "bs2/driver/driver96.h"
 #include "bs2/driver/rdwin.h"
 #include "bs2/driver/d_draw.h"
 #include "bs2/driver/palette.h"
 #include "bs2/driver/render.h"
+#include "bs2/header.h"		// HACK: For cutscenes instruction message
+#include "bs2/maketext.h"	// HACK: For cutscenes instruction message
+#include "bs2/sword2.h"
 
 namespace Sword2 {
 

Index: d_sound.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/bs2/driver/d_sound.cpp,v
retrieving revision 1.71
retrieving revision 1.72
diff -u -d -r1.71 -r1.72
--- d_sound.cpp	4 Oct 2003 01:09:29 -0000	1.71
+++ d_sound.cpp	4 Oct 2003 08:07:03 -0000	1.72
@@ -33,12 +33,12 @@
 // opinions on this?
 
 #include "stdafx.h"
-#include "bs2/driver/driver96.h"
-#include "bs2/driver/d_sound.h"
-#include "bs2/sword2.h"
 #include "sound/audiostream.h"
 #include "sound/mixer.h"
 #include "sound/rate.h"
+#include "bs2/driver/driver96.h"
+#include "bs2/driver/d_sound.h"
+#include "bs2/sword2.h"
 
 namespace Sword2 {
 

Index: driver96.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/bs2/driver/driver96.h,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -d -r1.51 -r1.52
--- driver96.h	4 Oct 2003 00:52:27 -0000	1.51
+++ driver96.h	4 Oct 2003 08:07:03 -0000	1.52
@@ -20,10 +20,6 @@
 #ifndef DRIVER96_H
 #define DRIVER96_H
 
-#include <limits.h>
-#include <stdio.h>
-#include <string.h>
-
 #include "common/scummsys.h"
 #include "base/engine.h" // for warning()
 #include "common/system.h"

Index: keyboard.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/bs2/driver/keyboard.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- keyboard.h	4 Oct 2003 00:52:27 -0000	1.5
+++ keyboard.h	4 Oct 2003 08:07:03 -0000	1.6
@@ -17,20 +17,6 @@
  * $Header$
  */
 
-//=============================================================================
-//
-//	Filename	:	keyboard.h
-//	Created		:	19th September 1996
-//	By			:	P.R.Porter
-//
-//	Summary		:	This include file defines links to all data which is
-//					defined in the keyboard.c module, but can be accessed by
-//					other parts of the driver96 library.
-//
-//
-//=============================================================================
-
-
 #ifndef KEYBOARD_H
 #define KEYBOARD_H
 

Index: menu.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/bs2/driver/menu.cpp,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -d -r1.16 -r1.17
--- menu.cpp	4 Oct 2003 00:52:27 -0000	1.16
+++ menu.cpp	4 Oct 2003 08:07:03 -0000	1.17
@@ -18,11 +18,11 @@
  */
 
 #include "stdafx.h"
+#include "common/rect.h"
 #include "bs2/driver/driver96.h"
 #include "bs2/driver/menu.h"
 #include "bs2/driver/d_draw.h"
 #include "bs2/driver/render.h"
-#include "common/rect.h"
 
 namespace Sword2 {
 

Index: menu.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/bs2/driver/menu.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- menu.h	23 Sep 2003 16:53:25 -0000	1.2
+++ menu.h	4 Oct 2003 08:07:03 -0000	1.3
@@ -17,25 +17,14 @@
  * $Header$
  */
 
-//=============================================================================
-//
-//	Filename	:	menu.h
-//	Created		:	15th November 1996
-//	By			:	P.R.Porter
-//
-//	Summary		:	This include file defines links to all data which is
-//					defined in the menu.c module, but can be accessed by
-//					other parts of the driver96 library.
-//
-//
-//=============================================================================
-
-
 #ifndef MENU_H
 #define MENU_H
 
+namespace Sword2 {
 
 #define MENUDEEP 40
+
+} // End of namespace Sword2
 
 #endif
 

Index: palette.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/bs2/driver/palette.cpp,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -d -r1.19 -r1.20
--- palette.cpp	4 Oct 2003 00:52:27 -0000	1.19
+++ palette.cpp	4 Oct 2003 08:07:03 -0000	1.20
@@ -18,8 +18,6 @@
  */
 
 #include "stdafx.h"
-#include <stdio.h>
-
 #include "common/util.h"
 #include "base/engine.h"
 #include "bs2/driver/d_draw.h"

Index: palette.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/bs2/driver/palette.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- palette.h	4 Oct 2003 00:52:27 -0000	1.5
+++ palette.h	4 Oct 2003 08:07:03 -0000	1.6
@@ -17,20 +17,6 @@
  * $Header$
  */
 
-//=============================================================================
-//
-//	Filename	:	palette.h
-//	Created		:	8th November 1996
-//	By			:	P.R.Porter
-//
-//	Summary		:	This include file defines links to all data which is
-//					defined in the palette.c module, but can be accessed by
-//					other parts of the driver96 library.
-//
-//
-//=============================================================================
-
-
 #ifndef PALETTE_H
 #define PALETTE_H
 

Index: rdwin.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/bs2/driver/rdwin.cpp,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -d -r1.30 -r1.31
--- rdwin.cpp	4 Oct 2003 01:09:29 -0000	1.30
+++ rdwin.cpp	4 Oct 2003 08:07:03 -0000	1.31
@@ -20,9 +20,7 @@
 #include "common/stdafx.h"
 #include "base/engine.h"
 #include "common/timer.h"
-
 #include "bs2/driver/driver96.h"
-
 #include "bs2/driver/_mouse.h"
 #include "bs2/driver/keyboard.h"
 #include "bs2/driver/rdwin.h"

Index: render.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/bs2/driver/render.h,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- render.h	4 Oct 2003 00:52:27 -0000	1.8
+++ render.h	4 Oct 2003 08:07:03 -0000	1.9
@@ -17,19 +17,6 @@
  * $Header$
  */
 
-//=============================================================================
-//
-//	Filename	:	render.h
-//	Created		:	26th August 1996
-//	By			:	P.R.Porter
-//
-//	Summary		:	This include file defines links to all data which is
-//					defined in the render.c module, but can be accessed by
-//					other parts of the driver96 library.
-//
-//
-//=============================================================================
-
 #ifndef RENDER_H
 #define RENDER_H
 

Index: sprite.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/bs2/driver/sprite.cpp,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -d -r1.27 -r1.28
--- sprite.cpp	4 Oct 2003 00:52:27 -0000	1.27
+++ sprite.cpp	4 Oct 2003 08:07:03 -0000	1.28
@@ -18,12 +18,12 @@
  */
 
 #include "stdafx.h"
-#include "driver96.h"
-#include "d_draw.h"
-#include "render.h"
-#include "menu.h"
-#include "palette.h"
-#include "rdwin.h"
+#include "bs2/driver/driver96.h"
+#include "bs2/driver/d_draw.h"
+#include "bs2/driver/render.h"
+#include "bs2/driver/menu.h"
+#include "bs2/driver/palette.h"
+#include "bs2/driver/rdwin.h"
 
 namespace Sword2 {