diff options
| author | Max Horn | 2002-12-25 00:38:53 +0000 |
|---|---|---|
| committer | Max Horn | 2002-12-25 00:38:53 +0000 |
| commit | 563f99b1fee90caabb5b52ab5cc1ef47c614cb94 (patch) | |
| tree | 17095870461a8cb8ba3299a16834d47b639b4988 /scumm | |
| parent | ce6913cf3666f9234d5b8a0b40e2959b8f7754a5 (diff) | |
| download | scummvm-rg350-563f99b1fee90caabb5b52ab5cc1ef47c614cb94.tar.gz scummvm-rg350-563f99b1fee90caabb5b52ab5cc1ef47c614cb94.tar.bz2 scummvm-rg350-563f99b1fee90caabb5b52ab5cc1ef47c614cb94.zip | |
more -pedantic warnings fixed
svn-id: r6109
Diffstat (limited to 'scumm')
| -rw-r--r-- | scumm/debugger.h | 2 | ||||
| -rw-r--r-- | scumm/dialogs.cpp | 4 | ||||
| -rw-r--r-- | scumm/imuse.cpp | 4 | ||||
| -rw-r--r-- | scumm/imuse.h | 2 |
4 files changed, 6 insertions, 6 deletions
diff --git a/scumm/debugger.h b/scumm/debugger.h index b3972ed2b4..3bedf6b9cc 100644 --- a/scumm/debugger.h +++ b/scumm/debugger.h @@ -72,7 +72,7 @@ protected: bool Cmd_Room(char _parameter[255][255]); #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 }; diff --git a/scumm/dialogs.cpp b/scumm/dialogs.cpp index a7d89c1aa3..e61e87d644 100644 --- a/scumm/dialogs.cpp +++ b/scumm/dialogs.cpp @@ -476,12 +476,12 @@ enum { kMusicVolumeChanged = 'muvc', kSfxVolumeChanged = 'sfvc', kOKCmd = 'ok ', - kCancelCmd = 'cncl', + kCancelCmd = 'cncl' }; enum { kKeysCmd = 'KEYS', - kAboutCmd = 'ABOU', + kAboutCmd = 'ABOU' }; OptionsDialog::OptionsDialog(NewGui *gui, Scumm *scumm) diff --git a/scumm/imuse.cpp b/scumm/imuse.cpp index 951c9bea55..9a0d6f9f20 100644 --- a/scumm/imuse.cpp +++ b/scumm/imuse.cpp @@ -287,7 +287,7 @@ public: pcChorus = 128, pcPitchBendFactor = 256, pcPriority = 512, - pcAll = 1023, + pcAll = 1023 }; private: @@ -2964,7 +2964,7 @@ void Player::sequencer_timer() enum { TYPE_PART = 1, - TYPE_PLAYER = 2, + TYPE_PLAYER = 2 }; int IMuseInternal::saveReference(void *me_ref, byte type, void *ref) diff --git a/scumm/imuse.h b/scumm/imuse.h index b3c5c92def..4b424c0689 100644 --- a/scumm/imuse.h +++ b/scumm/imuse.h @@ -44,7 +44,7 @@ public: ~IMuse(); enum { - PROP_TEMPO_BASE = 1, + PROP_TEMPO_BASE = 1 }; void on_timer(); |