SCI: Got rid of include/scitypes.h

svn-id: r38746

3 files changed, 19 insertions, 19 deletions

diff --git a/engines/sci/sfx/seq/gm.cpp b/engines/sci/sfx/seq/gm.cpp
index 13520b2eec..896c521007 100644
--- a/engines/sci/sfx/seq/gm.cpp
+++ b/engines/sci/sfx/seq/gm.cpp
@@ -94,7 +94,7 @@ midi_gm_reset_timer(GTimeVal ts) {
 #define MIDI_MASTER_VOLUME_LEN 8
 
 static int
-midi_gm_volume(guint8 volume) {
+midi_gm_volume(uint8 volume) {
 	byte data[MIDI_MASTER_VOLUME_LEN] = {
 		0xf0,
 		0x7f,
diff --git a/engines/sci/sfx/seq/map-mt32-to-gm.cpp b/engines/sci/sfx/seq/map-mt32-to-gm.cpp
index bc472935d4..10ba4bdbc5 100644
--- a/engines/sci/sfx/seq/map-mt32-to-gm.cpp
+++ b/engines/sci/sfx/seq/map-mt32-to-gm.cpp
@@ -228,8 +228,8 @@ static const char
 
 static struct {
 	const char *name;
-	gint8 gm_instr;
-	gint8 gm_rhythm_key;
+	int8 gm_instr;
+	int8 gm_rhythm_key;
 } MT32_PresetTimbreMaps[] = {
 	/*000*/  {"AcouPiano1", 0, SFX_UNMAPPED},
 	/*001*/  {"AcouPiano2", 1, SFX_UNMAPPED},
@@ -363,8 +363,8 @@ static struct {
 
 static struct {
 	const char *name;
-	gint8 gm_instr;
-	gint8 gm_rhythmkey;
+	int8 gm_instr;
+	int8 gm_rhythmkey;
 } MT32_RhythmTimbreMaps[] = {
 	/*00*/  {"Acou BD   ", SFX_MAPPED_TO_RHYTHM, 34},
 	/*01*/  {"Acou SD   ", SFX_MAPPED_TO_RHYTHM, 37},
@@ -398,7 +398,7 @@ static struct {
 	/*29*/  {"OpenHiHat2", SFX_MAPPED_TO_RHYTHM, 43}
 };
 
-static gint8
+static int8
 MT32_PresetRhythmKeymap[] = {
 	SFX_UNMAPPED, SFX_UNMAPPED, SFX_UNMAPPED, SFX_UNMAPPED, SFX_UNMAPPED, SFX_UNMAPPED, SFX_UNMAPPED, SFX_UNMAPPED, SFX_UNMAPPED, SFX_UNMAPPED,
 	SFX_UNMAPPED, SFX_UNMAPPED, SFX_UNMAPPED, SFX_UNMAPPED, SFX_UNMAPPED, SFX_UNMAPPED, SFX_UNMAPPED, SFX_UNMAPPED, SFX_UNMAPPED, SFX_UNMAPPED,
@@ -424,8 +424,8 @@ MT32_PresetRhythmKeymap[] = {
    R   - Rhythm... */
 static struct {
 	const char *name;
-	gint8 gm_instr;
-	gint8 gm_rhythm_key;
+	int8 gm_instr;
+	int8 gm_rhythm_key;
 } MT32_MemoryTimbreMaps[] = {
 	{"AccPnoKA2 ", 1, SFX_UNMAPPED},     /* ++ (KQ1) */
 	{"Acou BD   ", SFX_MAPPED_TO_RHYTHM, 34},   /* R (PQ2) */
@@ -560,7 +560,7 @@ static struct {
 	{0, 0, 0}
 };
 
-static gint8
+static int8
 lookup_instrument(const char *iname) {
 	int i = 0;
 
@@ -572,7 +572,7 @@ lookup_instrument(const char *iname) {
 	return SFX_UNMAPPED;
 }
 
-static gint8
+static int8
 lookup_rhythm_key(const char *iname) {
 	int i = 0;
 
@@ -675,9 +675,9 @@ print_map_rhythm_mem(int sci, int rhythm, char *mt32) {
 sfx_instrument_map_t *
 sfx_instrument_map_mt32_to_gm(byte *data, size_t size) {
 	int memtimbres, patches;
-	guint8 group, number, keyshift, finetune, bender_range;
-	guint8 *patchpointer;
-	guint32 pos;
+	uint8 group, number, keyshift, finetune, bender_range;
+	uint8 *patchpointer;
+	uint32 pos;
 	sfx_instrument_map_t * map;
 	int i;
 	int type;
diff --git a/engines/sci/sfx/seq/oss-adlib.cpp b/engines/sci/sfx/seq/oss-adlib.cpp
index be12033efb..24f936e089 100644
--- a/engines/sci/sfx/seq/oss-adlib.cpp
+++ b/engines/sci/sfx/seq/oss-adlib.cpp
@@ -50,7 +50,7 @@ extern int _seqbufptr;
 extern int seqfd;
 #endif
 
-static guint8 instr[MIDI_CHANNELS];
+static uint8 instr[MIDI_CHANNELS];
 static int dev;
 static int free_voices = ADLIB_VOICES;
 static long note_time[ADLIB_VOICES];
@@ -267,8 +267,8 @@ midi_adlib_reverb(int param) {
 }
 
 static inline int
-midi_adlib_event1(guint8 command, guint8 note, guint8 velocity) {
-	guint8 channel, oper;
+midi_adlib_event1(uint8 command, uint8 note, uint8 velocity) {
+	uint8 channel, oper;
 
 	channel = command & 0x0f;
 	oper = command & 0xf0;
@@ -301,9 +301,9 @@ midi_adlib_event1(guint8 command, guint8 note, guint8 velocity) {
 }
 
 static inline int
-midi_adlib_event2(guint8 command, guint8 param) {
-	guint8 channel;
-	guint8 oper;
+midi_adlib_event2(uint8 command, uint8 param) {
+	uint8 channel;
+	uint8 oper;
 
 	channel = command & 0x0f;
 	oper = command & 0xf0;