[Scummvm-cvs-logs] CVS: scummvm/bs2/driver d_sound.h,1.27,1.28 driver96.h,1.52,1.53 keyboard.cpp,1.10,1.11 language.cpp,1.7,1.8

[Torbj?rn Andersson]

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

Modified Files:
	d_sound.h driver96.h keyboard.cpp language.cpp 
Log Message:
Moved some stuff out of driver96.h. Eventually I'd like to get rid of most
Moved some stuff out of driver96.h. Eventually I'd like to get rid of this
file completely. Or at the very least most of it.


Index: d_sound.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/bs2/driver/d_sound.h,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -d -r1.27 -r1.28
--- d_sound.h	4 Oct 2003 01:09:29 -0000	1.27
+++ d_sound.h	4 Oct 2003 08:31:20 -0000	1.28
@@ -27,6 +27,10 @@
 
 namespace Sword2 {
 
+// Max number of sound fx
+#define MAXFX 16
+#define MAXMUS 2
+
 extern void sword2_sound_handler(void *refCon);
 
 typedef struct {

Index: driver96.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/bs2/driver/driver96.h,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -d -r1.52 -r1.53
--- driver96.h	4 Oct 2003 08:07:03 -0000	1.52
+++ driver96.h	4 Oct 2003 08:31:20 -0000	1.53
@@ -35,7 +35,6 @@
 // defines specific to windows headers...
 #ifndef WIN32
 
-#define SEM_FAILCRITICALERRORS 1
 #define FILE_ATTRIBUTE_NORMAL 0x80
 #define _MAX_PATH 260
 
@@ -109,18 +108,6 @@
 #define RDERR_INVALIDID			0x0008000D
 
 
-
-
-// Language codes
-#define ENGLISH				0x00
-#define AMERICAN			0x01
-#define GERMAN				0x02
-#define FRENCH				0x03
-#define SPANISH				0x04
-#define ITIALIAN			0x05
-#define JAPANESE			0x06
-#define SLOVAK				0x07
-
 // Key codes
 #define RDKEY_ESCAPE			27
 
@@ -147,15 +134,6 @@
 #define RDSPR_RLE256FAST		0x0200
 
 
-//Rendering defines
-#define RD_SOFTWARESCREENBUFFER		0x01
-
-
-//Windows defines
-#define RD_FULLSCREEN			0x01000000
-#define RD_WINDOWED			0x01000001
-
-
 //Fading defines
 #define RDFADE_NONE			0x00
 #define RDFADE_UP			0x01
@@ -206,13 +184,6 @@
 #define RDBLTFX_FLATALPHA		0x20
 #define RDBLTFX_GRADEDALPHA		0x40
 #define RDBLTFX_ALLHARDWARE		0x80
-
-// Max number of sound fx
-#define MAXFX 16
-#define MAXMUS 2
-
-// Key buffer size
-#define MAX_KEY_BUFFER 32
 
 // Maximum scaled size of a sprite
 #define SCALE_MAXWIDTH 512

Index: keyboard.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/bs2/driver/keyboard.cpp,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- keyboard.cpp	4 Oct 2003 00:52:27 -0000	1.10
+++ keyboard.cpp	4 Oct 2003 08:31:20 -0000	1.11
@@ -22,6 +22,9 @@
 
 namespace Sword2 {
 
+// Key buffer size
+#define MAX_KEY_BUFFER 32
+
 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.
 

Index: language.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/bs2/driver/language.cpp,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- language.cpp	4 Oct 2003 00:52:27 -0000	1.7
+++ language.cpp	4 Oct 2003 08:31:20 -0000	1.8
@@ -22,6 +22,16 @@
 
 namespace Sword2 {
 
+// Language codes
+#define ENGLISH		0x00
+#define AMERICAN	0x01
+#define GERMAN		0x02
+#define FRENCH		0x03
+#define SPANISH		0x04
+#define ITIALIAN	0x05
+#define JAPANESE	0x06
+#define SLOVAK		0x07
+
 uint8 languageVersion = ENGLISH;
 
 static uint8 versionFromFile = 0;