diff options
| author | Torbjörn Andersson | 2003-10-04 08:31:20 +0000 |
|---|---|---|
| committer | Torbjörn Andersson | 2003-10-04 08:31:20 +0000 |
| commit | f8ce610c2bb72330fa43f89b4cf6c07e647526b7 (patch) | |
| tree | 13f1ab578c8277b0053d30156af3636bb0cccfab | |
| parent | 4fad04846a1341aa1a115d7e6896c1f1ca7dd3ea (diff) | |
| download | scummvm-rg350-f8ce610c2bb72330fa43f89b4cf6c07e647526b7.tar.gz scummvm-rg350-f8ce610c2bb72330fa43f89b4cf6c07e647526b7.tar.bz2 scummvm-rg350-f8ce610c2bb72330fa43f89b4cf6c07e647526b7.zip | |
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.
svn-id: r10589
| -rw-r--r-- | sword2/driver/d_sound.h | 4 | ||||
| -rw-r--r-- | sword2/driver/driver96.h | 29 | ||||
| -rw-r--r-- | sword2/driver/keyboard.cpp | 3 | ||||
| -rw-r--r-- | sword2/driver/language.cpp | 10 |
4 files changed, 17 insertions, 29 deletions
diff --git a/sword2/driver/d_sound.h b/sword2/driver/d_sound.h index aaae7e9086..9c5b045821 100644 --- a/sword2/driver/d_sound.h +++ b/sword2/driver/d_sound.h @@ -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 { diff --git a/sword2/driver/driver96.h b/sword2/driver/driver96.h index ac07508df3..13bbdcbbb1 100644 --- a/sword2/driver/driver96.h +++ b/sword2/driver/driver96.h @@ -35,7 +35,6 @@ namespace Sword2 { // defines specific to windows headers... #ifndef WIN32 -#define SEM_FAILCRITICALERRORS 1 #define FILE_ATTRIBUTE_NORMAL 0x80 #define _MAX_PATH 260 @@ -109,18 +108,6 @@ namespace Sword2 { #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 @@ namespace Sword2 { #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 @@ -207,13 +185,6 @@ namespace Sword2 { #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 #define SCALE_MAXHEIGHT 512 diff --git a/sword2/driver/keyboard.cpp b/sword2/driver/keyboard.cpp index 609d0a75c5..85272a8d51 100644 --- a/sword2/driver/keyboard.cpp +++ b/sword2/driver/keyboard.cpp @@ -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. diff --git a/sword2/driver/language.cpp b/sword2/driver/language.cpp index 0995368b4f..a7b67d7f99 100644 --- a/sword2/driver/language.cpp +++ b/sword2/driver/language.cpp @@ -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; |