aboutsummaryrefslogtreecommitdiff
path: root/scumm
diff options
context:
space:
mode:
authorMax Horn2002-12-25 00:36:04 +0000
committerMax Horn2002-12-25 00:36:04 +0000
commitce6913cf3666f9234d5b8a0b40e2959b8f7754a5 (patch)
tree00a08e02f3b226a461d5b48f63e97bc285291740 /scumm
parent7cb69f7fa2f17eca5a1ad08162ce9e5e5a2cb5e4 (diff)
downloadscummvm-rg350-ce6913cf3666f9234d5b8a0b40e2959b8f7754a5.tar.gz
scummvm-rg350-ce6913cf3666f9234d5b8a0b40e2959b8f7754a5.tar.bz2
scummvm-rg350-ce6913cf3666f9234d5b8a0b40e2959b8f7754a5.zip
fix -pedantic warnings
svn-id: r6108
Diffstat (limited to 'scumm')
-rw-r--r--scumm/boxes.h2
-rw-r--r--scumm/sound.h3
2 files changed, 2 insertions, 3 deletions
diff --git a/scumm/boxes.h b/scumm/boxes.h
index cc04d2398d..32d56c73a6 100644
--- a/scumm/boxes.h
+++ b/scumm/boxes.h
@@ -30,7 +30,7 @@ typedef enum {
kBoxYFlip = 0x10,
kBoxPlayerOnly = 0x20,
kBoxLocked = 0x40,
- kBoxInvisible = 0x80,
+ kBoxInvisible = 0x80
} BoxFlags;
struct AdjustBoxResult { /* Result type of AdjustBox functions */
diff --git a/scumm/sound.h b/scumm/sound.h
index 64904baf8d..78182f2c2b 100644
--- a/scumm/sound.h
+++ b/scumm/sound.h
@@ -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];