Got rid of all the .h files but one in the 'driver' directory. They were

either very small or, in the case of driver96.h, a disorganized jumbles.

svn-id: r16952

1 files changed, 58 insertions, 14 deletions

diff --git a/sword2/defs.h b/sword2/defs.h
index e6f8639516..0dc84fbb64 100644
--- a/sword2/defs.h
+++ b/sword2/defs.h
@@ -24,20 +24,64 @@
 #define	SIZE	0x10000			// 65536 items per section
 #define	NuSIZE	0xffff			// & with this
 
-#define TEXT_OK             0x08EB0000
-#define TEXT_CANCEL         0x08EB0001
-#define TEXT_RESTORE        0x08EB0002
-#define TEXT_SAVE           0x08EB0003
-#define TEXT_QUIT           0x08EB0004
-#define TEXT_RESTART        0x08EB0005
-#define TEXT_OPTIONS        0x08EB000A
-#define TEXT_SUBTITLES      0x08EB000B
-#define TEXT_OBJECT_LABELS  0x08EB000C
-#define TEXT_MUSIC_VOLUME   0x08EB000E
-#define TEXT_SPEECH_VOLUME  0x08EB000F
-#define TEXT_FX_VOLUME      0x08EB0010
-#define TEXT_GFX_QUALITY    0x08EB0011
-#define TEXT_REVERSE_STEREO 0x08EB0015
+// Error codes
+
+enum {
+	// Generic error codes
+
+	RD_OK,
+	RDERR_UNKNOWN,
+	RDERR_OUTOFMEMORY,
+	RDERR_INVALIDFILENAME,
+
+	// Drawing error codes
+
+	RDERR_DECOMPRESSION,
+
+	// Sprite drawing error codes
+
+	RDERR_NOTIMPLEMENTED,
+	RDERR_NOTCLOSED,
+	RDERR_NOTOPEN,
+
+	// Menubar error codes
+
+	RDERR_INVALIDMENU,
+	RDERR_INVALIDPOCKET,
+	RDERR_INVALIDCOMMAND,
+
+	// Palette fading error codes
+
+	RDERR_FADEINCOMPLETE,
+
+	// Sound engine error codes
+
+	RDERR_SPEECHPLAYING,
+	RDERR_SPEECHNOTPLAYING,
+	RDERR_INVALIDWAV,
+	RDERR_FXALREADYOPEN,
+	RDERR_FXNOTOPEN,
+	RDERR_INVALIDID
+};
+
+// Text ids for the control panel etc.
+
+enum {
+	TEXT_OK				= 0x08EB0000,
+	TEXT_CANCEL			= 0x08EB0001,
+	TEXT_RESTORE			= 0x08EB0002,
+	TEXT_SAVE			= 0x08EB0003,
+	TEXT_QUIT			= 0x08EB0004,
+	TEXT_RESTART			= 0x08EB0005,
+	TEXT_OPTIONS			= 0x08EB000A,
+	TEXT_SUBTITLES			= 0x08EB000B,
+	TEXT_OBJECT_LABELS		= 0x08EB000C,
+	TEXT_MUSIC_VOLUME		= 0x08EB000E,
+	TEXT_SPEECH_VOLUME		= 0x08EB000F,
+	TEXT_FX_VOLUME			= 0x08EB0010,
+	TEXT_GFX_QUALITY		= 0x08EB0011,
+	TEXT_REVERSE_STEREO		= 0x08EB0015
+};
 
 // always 8 (George object used for Nico player character as well)
 #define CUR_PLAYER_ID 8