mirror of
https://github.com/libretro/scummvm.git
synced 2025-01-31 07:53:36 +00:00
more -pedantic warnings fixed
svn-id: r6109
This commit is contained in:
parent
ce6913cf36
commit
563f99b1fe
@ -37,7 +37,7 @@ enum {
|
|||||||
enum {
|
enum {
|
||||||
kListItemDoubleClickedCmd = 'LIdb', // double click on item - 'data' will be item index
|
kListItemDoubleClickedCmd = 'LIdb', // double click on item - 'data' will be item index
|
||||||
kListItemActivatedCmd = 'LIac', // item activated by return/enter - 'data' will be item index
|
kListItemActivatedCmd = 'LIac', // item activated by return/enter - 'data' will be item index
|
||||||
kListSelectionChangedCmd = 'Lsch', // selection changed - 'data' will be item index
|
kListSelectionChangedCmd = 'Lsch' // selection changed - 'data' will be item index
|
||||||
};
|
};
|
||||||
|
|
||||||
/* ListWidget */
|
/* ListWidget */
|
||||||
|
@ -31,7 +31,7 @@ enum {
|
|||||||
kLineBufferSize = 256,
|
kLineBufferSize = 256,
|
||||||
kCharWidth = 8,
|
kCharWidth = 8,
|
||||||
|
|
||||||
kHistorySize = 20,
|
kHistorySize = 20
|
||||||
};
|
};
|
||||||
|
|
||||||
class ScrollBarWidget;
|
class ScrollBarWidget;
|
||||||
|
@ -40,7 +40,7 @@ enum {
|
|||||||
enum {
|
enum {
|
||||||
kTextAlignLeft,
|
kTextAlignLeft,
|
||||||
kTextAlignCenter,
|
kTextAlignCenter,
|
||||||
kTextAlignRight,
|
kTextAlignRight
|
||||||
};
|
};
|
||||||
|
|
||||||
// Extremly simple stack class, doesn't even do any error checking (for now)
|
// Extremly simple stack class, doesn't even do any error checking (for now)
|
||||||
|
@ -55,7 +55,7 @@ enum {
|
|||||||
|
|
||||||
enum {
|
enum {
|
||||||
kButtonWidth = 56,
|
kButtonWidth = 56,
|
||||||
kButtonHeight = 16,
|
kButtonHeight = 16
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
||||||
|
@ -72,7 +72,7 @@ protected:
|
|||||||
bool Cmd_Room(char _parameter[255][255]);
|
bool Cmd_Room(char _parameter[255][255]);
|
||||||
|
|
||||||
#ifdef USE_CONSOLE
|
#ifdef USE_CONSOLE
|
||||||
static bool ScummDebugger::debuggerInputCallback(ConsoleDialog *console, const char *input, void *refCon);
|
static bool debuggerInputCallback(ConsoleDialog *console, const char *input, void *refCon);
|
||||||
#endif
|
#endif
|
||||||
};
|
};
|
||||||
|
|
||||||
|
@ -476,12 +476,12 @@ enum {
|
|||||||
kMusicVolumeChanged = 'muvc',
|
kMusicVolumeChanged = 'muvc',
|
||||||
kSfxVolumeChanged = 'sfvc',
|
kSfxVolumeChanged = 'sfvc',
|
||||||
kOKCmd = 'ok ',
|
kOKCmd = 'ok ',
|
||||||
kCancelCmd = 'cncl',
|
kCancelCmd = 'cncl'
|
||||||
};
|
};
|
||||||
|
|
||||||
enum {
|
enum {
|
||||||
kKeysCmd = 'KEYS',
|
kKeysCmd = 'KEYS',
|
||||||
kAboutCmd = 'ABOU',
|
kAboutCmd = 'ABOU'
|
||||||
};
|
};
|
||||||
|
|
||||||
OptionsDialog::OptionsDialog(NewGui *gui, Scumm *scumm)
|
OptionsDialog::OptionsDialog(NewGui *gui, Scumm *scumm)
|
||||||
|
@ -287,7 +287,7 @@ public:
|
|||||||
pcChorus = 128,
|
pcChorus = 128,
|
||||||
pcPitchBendFactor = 256,
|
pcPitchBendFactor = 256,
|
||||||
pcPriority = 512,
|
pcPriority = 512,
|
||||||
pcAll = 1023,
|
pcAll = 1023
|
||||||
};
|
};
|
||||||
|
|
||||||
private:
|
private:
|
||||||
@ -2964,7 +2964,7 @@ void Player::sequencer_timer()
|
|||||||
|
|
||||||
enum {
|
enum {
|
||||||
TYPE_PART = 1,
|
TYPE_PART = 1,
|
||||||
TYPE_PLAYER = 2,
|
TYPE_PLAYER = 2
|
||||||
};
|
};
|
||||||
|
|
||||||
int IMuseInternal::saveReference(void *me_ref, byte type, void *ref)
|
int IMuseInternal::saveReference(void *me_ref, byte type, void *ref)
|
||||||
|
@ -44,7 +44,7 @@ public:
|
|||||||
~IMuse();
|
~IMuse();
|
||||||
|
|
||||||
enum {
|
enum {
|
||||||
PROP_TEMPO_BASE = 1,
|
PROP_TEMPO_BASE = 1
|
||||||
};
|
};
|
||||||
|
|
||||||
void on_timer();
|
void on_timer();
|
||||||
|
Loading…
x
Reference in New Issue
Block a user