[Scummvm-cvs-logs] CVS: scummvm/bs2/driver _console.cpp,1.6,1.7 _console.h,1.2,1.3 _mouse.cpp,1.21,1.22 _mouse.h,1.3,1.4 d_draw.cpp,1.33,1.34 d_draw.h,1.8,1.9 d_sound.cpp,1.69,1.70 d_sound.h,1.25,1.26 driver96.h,1.50,1.51 keyboard.cpp,1.9,1.10 keyboard.h,1.4,1.5 language.cpp,1.6,1.7 menu.cpp,1.15,1.16 misc.cpp,1.12,1.13 palette.cpp,1.18,1.19 palette.h,1.4,1.5 rdwin.cpp,1.28,1.29 rdwin.h,1.4,1.5 render.cpp,1.32,1.33 render.h,1.7,1.8 sprite.cpp,1.26,1.27

[Max Horn]

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

Modified Files:
	_console.cpp _console.h _mouse.cpp _mouse.h d_draw.cpp 
	d_draw.h d_sound.cpp d_sound.h driver96.h keyboard.cpp 
	keyboard.h language.cpp menu.cpp misc.cpp palette.cpp 
	palette.h rdwin.cpp rdwin.h render.cpp render.h sprite.cpp 
Log Message:
added namespace Sword2

Index: _console.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/bs2/driver/_console.cpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- _console.cpp	23 Sep 2003 16:53:25 -0000	1.6
+++ _console.cpp	4 Oct 2003 00:52:26 -0000	1.7
@@ -47,11 +47,12 @@
 //#include "ddraw.h"
 
 #include "stdafx.h"
-#include "driver96.h"
+#include "bs2/driver/driver96.h"
 
-#include "d_draw.h"
+#include "bs2/driver/d_draw.h"
 
 
+namespace Sword2 {
 
 uint8			consoleStatus = 0;			// 1 - console display
 //static uint16	consoley = 0;
@@ -152,3 +153,4 @@
 
 }
 
+} // End of namespace Sword2

Index: _console.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/bs2/driver/_console.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- _console.h	23 Sep 2003 16:53:25 -0000	1.2
+++ _console.h	4 Oct 2003 00:52:26 -0000	1.3
@@ -30,12 +30,14 @@
 //=============================================================================
 
 
-#ifndef CONSOLE_H
-#define CONSOLE_H
-
+#ifndef DRIVER_CONSOLE_H
+#define DRIVER_CONSOLE_H
 
+namespace Sword2 {
 
 extern void DisplayConsole(void);
+
+} // End of namespace Sword2
 
 
 #endif

Index: _mouse.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/bs2/driver/_mouse.cpp,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -d -r1.21 -r1.22
--- _mouse.cpp	3 Oct 2003 13:53:46 -0000	1.21
+++ _mouse.cpp	4 Oct 2003 00:52:26 -0000	1.22
@@ -18,11 +18,13 @@
  */
 
 #include "stdafx.h"
-#include "driver96.h"
-#include "d_draw.h"
-#include "render.h"
-#include "menu.h"
-#include "../sword2.h"
+#include "bs2/driver/driver96.h"
+#include "bs2/driver/d_draw.h"
+#include "bs2/driver/render.h"
+#include "bs2/driver/menu.h"
+#include "bs2/sword2.h"
+
+namespace Sword2 {
 
 #define MAX_MOUSE_EVENTS 16
 #define MOUSEFLASHFRAME 6
@@ -312,3 +314,5 @@
 
 	return RD_OK;
 }
+
+} // End of namespace Sword2

Index: _mouse.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/bs2/driver/_mouse.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- _mouse.h	29 Sep 2003 14:19:22 -0000	1.3
+++ _mouse.h	4 Oct 2003 00:52:26 -0000	1.4
@@ -17,13 +17,17 @@
  * $Header$
  */
 
-#ifndef MOUSE_H
-#define MOUSE_H
+#ifndef DRIVER_MOUSE_H
+#define DRIVER_MOUSE_H
+
+namespace Sword2 {
 
 extern int16 mousex;		// Mouse x coordinate
 extern int16 mousey;		// Mouse y coordinate
 
 extern void LogMouseEvent(uint16 buttons);
 extern int32 DrawMouse(void);
+
+} // End of namespace Sword2
 
 #endif

Index: d_draw.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/bs2/driver/d_draw.cpp,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -d -r1.33 -r1.34
--- d_draw.cpp	2 Oct 2003 17:43:01 -0000	1.33
+++ d_draw.cpp	4 Oct 2003 00:52:26 -0000	1.34
@@ -19,15 +19,17 @@
 
 #include <stdio.h>
 #include "stdafx.h"
-#include "driver96.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 "rdwin.h"
-#include "d_draw.h"
-#include "palette.h"
-#include "render.h"
+#include "bs2/driver/rdwin.h"
+#include "bs2/driver/d_draw.h"
+#include "bs2/driver/palette.h"
+#include "bs2/driver/render.h"
+
+namespace Sword2 {
 
 byte *lpBackBuffer;
 
@@ -331,3 +333,5 @@
 
 	return RD_OK;
 }
+
+} // End of namespace Sword2

Index: d_draw.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/bs2/driver/d_draw.h,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- d_draw.h	27 Sep 2003 17:41:02 -0000	1.8
+++ d_draw.h	4 Oct 2003 00:52:26 -0000	1.9
@@ -20,16 +20,12 @@
 #ifndef D_DRAW_H
 #define D_DRAW_H
 
-#ifdef __cplusplus
-extern "C" {
-#endif
+#include "bs2/driver/driver96.h"
 
-#include "driver96.h"
+namespace Sword2 {
 
 extern byte *lpBackBuffer;
 
-#ifdef __cplusplus
-}
-#endif
+} // End of namespace Sword2
 
 #endif

Index: d_sound.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/bs2/driver/d_sound.cpp,v
retrieving revision 1.69
retrieving revision 1.70
diff -u -d -r1.69 -r1.70
--- d_sound.cpp	3 Oct 2003 13:59:44 -0000	1.69
+++ d_sound.cpp	4 Oct 2003 00:52:26 -0000	1.70
@@ -33,13 +33,15 @@
 // opinions on this?
 
 #include "stdafx.h"
-#include "driver96.h"
-#include "d_sound.h"
-#include "../sword2.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"
 
+namespace Sword2 {
+
 // Fade-out takes half a second. This may need some tuning.
 #define FADE_SAMPLES 11025
 
@@ -1150,3 +1152,5 @@
 uint8 Sword2Sound::isMusicMute(void) {
 	return _musicMuted;
 }
+
+} // End of namespace Sword2

Index: d_sound.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/bs2/driver/d_sound.h,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -d -r1.25 -r1.26
--- d_sound.h	3 Oct 2003 06:54:44 -0000	1.25
+++ d_sound.h	4 Oct 2003 00:52:27 -0000	1.26
@@ -25,6 +25,8 @@
 #include "sound/rate.h"
 #include "common/file.h"
 
+namespace Sword2 {
+
 extern void sword2_sound_handler(void *refCon);
 
 typedef struct {
@@ -135,5 +137,7 @@
 	int32 setFxIdVolumePan(int32 id, uint8 vol, int8 pan);
 	int32 setFxIdVolume(int32 id, uint8 vol);
 };
+
+} // End of namespace Sword2
 
 #endif

Index: driver96.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/bs2/driver/driver96.h,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -d -r1.50 -r1.51
--- driver96.h	3 Oct 2003 13:53:46 -0000	1.50
+++ driver96.h	4 Oct 2003 00:52:27 -0000	1.51
@@ -29,9 +29,7 @@
 #include "common/system.h"
 #include "common/rect.h"
 
-#ifdef __cplusplus
-extern "C" {
-#endif
+namespace Sword2 {
 
 //
 //	Defines
@@ -425,8 +423,6 @@
 extern int32 renderCaps;	// Flags which determine how to render the scene.
 extern uint8 palCopy[256][4];	// Current palette.
 
-#ifdef __cplusplus
-}
-#endif
+} // End of namespace Sword2
 
 #endif

Index: keyboard.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/bs2/driver/keyboard.cpp,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- keyboard.cpp	28 Sep 2003 14:13:57 -0000	1.9
+++ keyboard.cpp	4 Oct 2003 00:52:27 -0000	1.10
@@ -18,7 +18,9 @@
  */
 
 #include "stdafx.h"
-#include "driver96.h"
+#include "bs2/driver/driver96.h"
+
+namespace Sword2 {
 
 uint8 keyBacklog = 0;	// The number of key presses waiting to be processed.
 uint8 keyPointer = 0;	// Index of the next key to read from the buffer.
@@ -69,3 +71,5 @@
 
 	return RD_OK;
 }
+
+} // End of namespace Sword2

Index: keyboard.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/bs2/driver/keyboard.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- keyboard.h	23 Sep 2003 16:53:25 -0000	1.4
+++ keyboard.h	4 Oct 2003 00:52:27 -0000	1.5
@@ -34,6 +34,10 @@
 #ifndef KEYBOARD_H
 #define KEYBOARD_H
 
+namespace Sword2 {
+
 void WriteKey(uint16 ascii, int keycode, int modifier);		// Adds a keypress to the buffer
+
+} // End of namespace Sword2
 
 #endif

Index: language.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/bs2/driver/language.cpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- language.cpp	28 Sep 2003 14:13:57 -0000	1.6
+++ language.cpp	4 Oct 2003 00:52:27 -0000	1.7
@@ -18,7 +18,9 @@
  */
 
 #include "stdafx.h"
-#include "driver96.h"
+#include "bs2/driver/driver96.h"
+
+namespace Sword2 {
 
 uint8 languageVersion = ENGLISH;
 
@@ -83,3 +85,5 @@
 
 	return rv;
 }
+
+} // End of namespace Sword2

Index: menu.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/bs2/driver/menu.cpp,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- menu.cpp	2 Oct 2003 17:43:01 -0000	1.15
+++ menu.cpp	4 Oct 2003 00:52:27 -0000	1.16
@@ -18,12 +18,14 @@
  */
 
 #include "stdafx.h"
-#include "driver96.h"
-#include "menu.h"
-#include "d_draw.h"
-#include "render.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 {
+
 #define MENUDEEP 40
 #define MAXMENUANIMS 8
 
@@ -326,5 +328,4 @@
 	return menuStatus[menu];
 }
 
-
-
+} // End of namespace Sword2

Index: misc.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/bs2/driver/misc.cpp,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- misc.cpp	29 Sep 2003 13:46:48 -0000	1.12
+++ misc.cpp	4 Oct 2003 00:52:27 -0000	1.13
@@ -18,8 +18,10 @@
  */
 
 #include "stdafx.h"
-#include "driver96.h"
-#include "../sword2.h"
+#include "bs2/driver/driver96.h"
+#include "bs2/sword2.h"
+
+namespace Sword2 {
 
 uint32 SVM_timeGetTime(void) {
 	return g_system->get_msecs();
@@ -38,3 +40,5 @@
 	strcpy(sCDName, CD1_LABEL);
 	return 1;
 }
+
+} // End of namespace Sword2

Index: palette.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/bs2/driver/palette.cpp,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -d -r1.18 -r1.19
--- palette.cpp	28 Sep 2003 14:13:57 -0000	1.18
+++ palette.cpp	4 Oct 2003 00:52:27 -0000	1.19
@@ -22,9 +22,11 @@
 
 #include "common/util.h"
 #include "base/engine.h"
-#include "d_draw.h"
-#include "driver96.h"
-#include "../sword2.h"
+#include "bs2/driver/d_draw.h"
+#include "bs2/driver/driver96.h"
+#include "bs2/sword2.h"
+
+namespace Sword2 {
 
 #define PALTABLESIZE 64 * 64 * 64
 
@@ -263,3 +265,5 @@
 
 	g_system->set_palette(newPalette, 0, 256);
 }
+
+} // End of namespace Sword2

Index: palette.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/bs2/driver/palette.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- palette.h	23 Sep 2003 16:53:25 -0000	1.4
+++ palette.h	4 Oct 2003 00:52:27 -0000	1.5
@@ -34,11 +34,13 @@
 #ifndef PALETTE_H
 #define PALETTE_H
 
+namespace Sword2 {
+
 extern uint8 paletteMatch[64*64*64];
 
 extern int32 RestorePalette(void);
 extern void FadeServer();
 
+} // End of namespace Sword2
 
 #endif
-

Index: rdwin.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/bs2/driver/rdwin.cpp,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -d -r1.28 -r1.29
--- rdwin.cpp	28 Sep 2003 14:13:57 -0000	1.28
+++ rdwin.cpp	4 Oct 2003 00:52:27 -0000	1.29
@@ -21,18 +21,20 @@
 #include "base/engine.h"
 #include "common/timer.h"
 
-#include "driver96.h"
+#include "bs2/driver/driver96.h"
 
-#include "_mouse.h"
-#include "keyboard.h"
-#include "rdwin.h"
-#include "d_draw.h"
-#include "palette.h"
-#include "render.h"
-#include "menu.h"
-#include "d_sound.h"
+#include "bs2/driver/_mouse.h"
+#include "bs2/driver/keyboard.h"
+#include "bs2/driver/rdwin.h"
+#include "bs2/driver/d_draw.h"
+#include "bs2/driver/palette.h"
+#include "bs2/driver/render.h"
+#include "bs2/driver/menu.h"
+#include "bs2/driver/d_sound.h"
 #include "bs2/sword2.h"
 
+namespace Sword2 {
+
 #define MENUDEEP 40		// Temporary, until menu.h is written!
 
 // ---------------------------------------------------------------------------
@@ -126,3 +128,5 @@
 	// SetWindowText(hwnd, windowName);
 	// strcpy(gameName, windowName);
 }
+
+} // End of namespace Sword2

Index: rdwin.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/bs2/driver/rdwin.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- rdwin.h	27 Sep 2003 11:02:58 -0000	1.4
+++ rdwin.h	4 Oct 2003 00:52:27 -0000	1.5
@@ -20,6 +20,10 @@
 #ifndef RDWIN_H
 #define RDWIN_H
 
+namespace Sword2 {
+
 extern void SetNeedRedraw(void);
+
+} // End of namespace Sword2
 
 #endif

Index: render.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/bs2/driver/render.cpp,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -d -r1.32 -r1.33
--- render.cpp	2 Oct 2003 17:43:01 -0000	1.32
+++ render.cpp	4 Oct 2003 00:52:27 -0000	1.33
@@ -18,13 +18,15 @@
  */
 
 #include "stdafx.h"
-#include "driver96.h"
-#include "d_draw.h"
-#include "rdwin.h"
-#include "_mouse.h"
-#include "render.h"
-#include "menu.h"
-#include "../sword2.h"
+#include "bs2/driver/driver96.h"
+#include "bs2/driver/d_draw.h"
+#include "bs2/driver/rdwin.h"
+#include "bs2/driver/_mouse.h"
+#include "bs2/driver/render.h"
+#include "bs2/driver/menu.h"
+#include "bs2/sword2.h"
+
+namespace Sword2 {
 
 #define MILLISECSPERCYCLE 83
 
@@ -1010,3 +1012,5 @@
 	layer = 0;
 	return RD_OK;
 }
+
+} // End of namespace Sword2

Index: render.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/bs2/driver/render.h,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- render.h	2 Oct 2003 17:43:01 -0000	1.7
+++ render.h	4 Oct 2003 00:52:27 -0000	1.8
@@ -33,7 +33,9 @@
 #ifndef RENDER_H
 #define RENDER_H
 
-#include "menu.h"
+#include "bs2/driver/menu.h"
+
+namespace Sword2 {
 
 #define RENDERWIDE		640
 #define ALIGNRENDERDEEP		480
@@ -57,5 +59,7 @@
 void StretchImage(byte *dst, uint16 dstPitch, uint16 dstWidth, uint16 dstHeight, byte *src, uint16 srcPitch, uint16 srcWidth, uint16 srcHeight, byte *backbuf);
 
 void UploadRect(Common::Rect *r);
+
+} // End of namespace Sword2
 
 #endif

Index: sprite.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/bs2/driver/sprite.cpp,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -d -r1.26 -r1.27
--- sprite.cpp	2 Oct 2003 17:43:01 -0000	1.26
+++ sprite.cpp	4 Oct 2003 00:52:27 -0000	1.27
@@ -25,6 +25,8 @@
 #include "palette.h"
 #include "rdwin.h"
 
+namespace Sword2 {
+
 static uint8 *lightMask = 0;
 
 /**
@@ -714,3 +716,5 @@
 	lightMask = 0;
 	return RD_OK;
 }
+
+} // End of namespace Sword2