[Scummvm-cvs-logs] CVS: scummvm/sword2/driver driver96.h,1.62,1.63 language.cpp,1.11,NONE
Torbj?rn Andersson
eriktorbjorn at users.sourceforge.net
Mon Nov 24 23:48:10 CET 2003
Update of /cvsroot/scummvm/scummvm/sword2/driver
In directory sc8-pr-cvs1:/tmp/cvs-serv5822/driver
Modified Files:
driver96.h
Removed Files:
language.cpp
Log Message:
More cleanup. Another unused file bites the dust.
Index: driver96.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sword2/driver/driver96.h,v
retrieving revision 1.62
retrieving revision 1.63
diff -u -d -r1.62 -r1.63
--- driver96.h 16 Nov 2003 14:18:29 -0000 1.62
+++ driver96.h 25 Nov 2003 07:35:52 -0000 1.63
@@ -24,10 +24,7 @@
class Sword2Engine;
-//
-// Defines
-// -------
-//
+// Error codes
enum {
// Generic error codes
@@ -80,12 +77,6 @@
RDERR_INVALIDID
};
-// Key codes
-
-enum {
-// RDKEY_ESCAPE = 27
-};
-
// Mouse button defines
enum {
@@ -180,10 +171,7 @@
RDBLTFX_EDGEBLEND = 0x04
};
-//
-// Structure definitions
-// ---------------------
-//
+// Structure definitions
typedef struct {
uint16 buttons;
@@ -209,7 +197,6 @@
#pragma END_PACK_STRUCTS
#endif
-
// The _spriteInfo structure is used to tell the driver96 code what attributes
// are linked to a sprite for drawing. These include position, scaling and
// compression.
@@ -228,11 +215,11 @@
uint8 *colourTable; // pointer to 16-byte colour table, only applicable to 16-col compression type
} _spriteInfo;
+// This is the format of a .WAV file. Somewhere after this header is the
+// string 'DATA' followed by an int32 size which is the size of the data.
+// Following the size of the data is the data itself.
-// This is the format of a .WAV file. Somewhere after this header is the string
-// 'DATA' followed by an int32 size which is the size of the data. Following
-// the size of the data is the data itself.
-typedef struct {
+ typedef struct {
uint32 riff;
uint32 fileLength;
uint32 wavID;
@@ -248,10 +235,9 @@
uint16 bitsPerSample;
} _wavHeader;
-
-// This is the structure which is passed to the sequence player.
-// It includes the smack to play, and any text lines which are
-// to be displayed over the top of the sequence.
+// This is the structure which is passed to the sequence player. It includes
+// the smack to play, and any text lines which are to be displayed over the top
+// of the sequence.
typedef struct {
uint16 startFrame;
@@ -261,18 +247,9 @@
uint16 *speech;
} _movieTextObject;
-//
-// Function Prototypes
-// -------------------
-//
-
-//-----------------------------------------------------------------------------
-// Language functions - from language.c
-//-----------------------------------------------------------------------------
-extern int32 GetLanguageVersion(uint8 *version);
-extern int32 SetLanguageVersion(uint8 version);
-//-----------------------------------------------------------------------------
+// Input handling class
+// Mouse buffer size
#define MAX_MOUSE_EVENTS 16
// Key buffer size
--- language.cpp DELETED ---
More information about the Scummvm-git-logs
mailing list