aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--gui/newgui.cpp2
-rw-r--r--scumm/smush/scumm_renderer.cpp2
-rw-r--r--simon/intern.h4
-rw-r--r--sound/midistreamer.h2
4 files changed, 5 insertions, 5 deletions
diff --git a/gui/newgui.cpp b/gui/newgui.cpp
index f280b308c7..4f1db088bd 100644
--- a/gui/newgui.cpp
+++ b/gui/newgui.cpp
@@ -47,7 +47,7 @@ enum {
kCursorAnimateDelay = 500,
kKeyRepeatInitialDelay = 400,
- kKeyRepeatSustainDelay = 100,
+ kKeyRepeatSustainDelay = 100
};
// Built-in font
diff --git a/scumm/smush/scumm_renderer.cpp b/scumm/smush/scumm_renderer.cpp
index 0664a65e1f..9947a5e380 100644
--- a/scumm/smush/scumm_renderer.cpp
+++ b/scumm/smush/scumm_renderer.cpp
@@ -112,7 +112,7 @@ bool ScummMixer::addChannel(_Channel * c) {
fprintf(stderr, "_nextIndex == %d\n", _nextIndex);
for(i = _mixer->_beginSlots; i < SoundMixer::NUM_CHANNELS; i++) {
- fprintf(stderr, "channel %d : %p(%d, %d) %d %d\n", i, _channels[i].chan,
+ fprintf(stderr, "channel %d : %p(%d, %d) %d %d\n", i, (void *)_channels[i].chan,
_channels[i].chan ? _channels[i].chan->getTrackIdentifier() : -1,
_channels[i].chan ? _channels[i].chan->isTerminated() : 1,
_channels[i].first, _channels[i].mixer_index);
diff --git a/simon/intern.h b/simon/intern.h
index 269293761d..ee787db968 100644
--- a/simon/intern.h
+++ b/simon/intern.h
@@ -98,7 +98,7 @@ struct FillOrCopyStruct {
enum {
SUBROUTINE_LINE_SMALL_SIZE = 2,
- SUBROUTINE_LINE_BIG_SIZE = 8,
+ SUBROUTINE_LINE_BIG_SIZE = 8
};
struct SubroutineLine {
@@ -144,7 +144,7 @@ enum {
GAME_SIMON2TALKIE = GAME_SIMON2 + GAME_TALKIE,
GAME_SIMON1WIN = GAME_WIN + GAME_TALKIE,
GAME_SIMON2WIN = GAME_SIMON2 + GAME_WIN + GAME_TALKIE,
- GAME_SIMON1DEMO = GAME_DEMO,
+ GAME_SIMON1DEMO = GAME_DEMO
};
#endif
diff --git a/sound/midistreamer.h b/sound/midistreamer.h
index 6e598104b2..760ebf4cdb 100644
--- a/sound/midistreamer.h
+++ b/sound/midistreamer.h
@@ -41,7 +41,7 @@ public:
// event = (ME_xxx<<24) | <24-bit data associated with event>
enum {
ME_NONE = 0,
- ME_TEMPO = 1,
+ ME_TEMPO = 1
};
private: