libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2024-12-14 05:38:56 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix -pedantic warnings

Browse Source 
svn-id: r6108
This commit is contained in:
Max Horn 2002-12-25 00:36:04 +00:00
parent 7cb69f7fa2
commit ce6913cf36
6 changed files with 18 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
common/gameDetector.h
View File

@ -56,7 +56,7 @@ enum GameId {
/* Simon the Sorcerer */
GID_SIMON_FIRST = 20,
GID_SIMON_LAST = GID_SIMON_FIRST + 8,
GID_SIMON_LAST = GID_SIMON_FIRST + 8
};
enum GameFeatures {

6
common/system.h
View File

@ -56,13 +56,13 @@ public:
EVENT_RBUTTONDOWN = 6,
EVENT_RBUTTONUP = 7,
EVENT_WHEELUP = 8,
EVENT_WHEELDOWN = 9,
EVENT_WHEELDOWN = 9
};
enum {
KBD_CTRL = 1,
KBD_ALT = 2,
KBD_SHIFT = 4,
KBD_SHIFT = 4
};
enum {
@ -83,7 +83,7 @@ public:
enum {
SOUND_8BIT = 0,
SOUND_16BIT = 1,
SOUND_16BIT = 1
};
// Set colors of the palette

2
scumm/boxes.h
View File

@ -30,7 +30,7 @@ typedef enum {
kBoxYFlip = 0x10,
kBoxPlayerOnly = 0x20,
kBoxLocked = 0x40,
kBoxInvisible = 0x80,
kBoxInvisible = 0x80
} BoxFlags;
struct AdjustBoxResult { /* Result type of AdjustBox functions */

3
scumm/sound.h
View File

@ -34,8 +34,7 @@ private:
enum {
SOUND_HEADER_SIZE = 26,
SOUND_HEADER_BIG_SIZE = 26 + 8,
SOUND_HEADER_BIG_SIZE = 26 + 8
};
int16 _soundQuePos, _soundQue[0x100];

4
sound/mididrv.h
View File

@ -37,12 +37,12 @@ public:
MERR_CANNOT_CONNECT = 1,
// MERR_STREAMING_NOT_AVAILABLE = 2,
MERR_DEVICE_NOT_AVAILABLE = 3,
MERR_ALREADY_OPEN = 4,
MERR_ALREADY_OPEN = 4
};
enum {
PROP_TIMEDIV = 1,
PROP_SMALLHEADER = 2,
PROP_SMALLHEADER = 2
};

20
sound/mixer.h
View File

@ -174,7 +174,7 @@ public:
bool _paused;
enum {
NUM_CHANNELS = 16,
NUM_CHANNELS = 16
};
void * _premixParam;
@ -193,16 +193,16 @@ public:
void unInsert(Channel * chan);
void beginSlots(int index);
/* start playing a raw sound */
// start playing a raw sound
enum {
/* Do *NOT* change any of these flags without looking at the code in mixer.cpp */
FLAG_UNSIGNED = 1, /* unsigned samples */
FLAG_STEREO = 2, /* sound is in stereo */
FLAG_16BITS = 4, /* sound is 16 bits wide */
FLAG_AUTOFREE = 8, /* sound buffer is freed automagically at the end of playing */
FLAG_FILE = 16, /* sound is a FILE * that's read from */
FLAG_REVERSE_STEREO = 32, /* sound should be reverse stereo */
FLAG_LOOP = 64, /* loop the audio */
// Do *NOT* change any of these flags without looking at the code in mixer.cpp
FLAG_UNSIGNED = 1, // unsigned samples
FLAG_STEREO = 2, // sound is in stereo
FLAG_16BITS = 4, // sound is 16 bits wide
FLAG_AUTOFREE = 8, // sound buffer is freed automagically at the end of playing
FLAG_FILE = 16, // sound is a FILE * that's read from
FLAG_REVERSE_STEREO = 32, // sound should be reverse stereo
FLAG_LOOP = 64 // loop the audio
};
int playRaw(PlayingSoundHandle * handle, void * sound, uint32 size, uint rate, byte flags);
int playRaw(PlayingSoundHandle * handle, void * sound, uint32 size, uint rate, byte flags, int id);