aboutsummaryrefslogtreecommitdiff
path: root/engines/lastexpress
diff options
context:
space:
mode:
authorLittleboy2011-06-29 06:28:55 -0400
committerLittleboy2011-06-29 11:07:26 -0400
commit4526bbb5b63c40a365abf5f150bfbd29cbff32c9 (patch)
tree754d8df04e069fa2bfce66321ba0f7eb0d1df82c /engines/lastexpress
parent9cc5d404c7c5d096f05d37680eb85929802290df (diff)
downloadscummvm-rg350-4526bbb5b63c40a365abf5f150bfbd29cbff32c9.tar.gz
scummvm-rg350-4526bbb5b63c40a365abf5f150bfbd29cbff32c9.tar.bz2
scummvm-rg350-4526bbb5b63c40a365abf5f150bfbd29cbff32c9.zip
LASTEXPRESS: Move SoundStatus to shared header
Diffstat (limited to 'engines/lastexpress')
-rw-r--r--engines/lastexpress/shared.h21
-rw-r--r--engines/lastexpress/sound/entry.h21
2 files changed, 21 insertions, 21 deletions
diff --git a/engines/lastexpress/shared.h b/engines/lastexpress/shared.h
index 69816a3d6c..6969e437ea 100644
--- a/engines/lastexpress/shared.h
+++ b/engines/lastexpress/shared.h
@@ -89,6 +89,27 @@ enum SoundState {
kSoundState2 = 2
};
+enum SoundStatus {
+ kSoundStatus_20 = 0x20,
+ kSoundStatus_40 = 0x40,
+ kSoundStatus_180 = 0x180,
+ kSoundStatusRemoved = 0x200,
+ kSoundStatus_400 = 0x400,
+
+ kSoundStatus_8000 = 0x8000,
+ kSoundStatus_20000 = 0x20000,
+ kSoundStatus_100000 = 0x100000,
+ kSoundStatus_20000000 = 0x20000000,
+ kSoundStatus_40000000 = 0x40000000,
+
+ kSoundStatusClear0 = 0x10,
+ kSoundStatusClear1 = 0x1F,
+ kSoundStatusClear2 = 0x80,
+ kSoundStatusClear3 = 0x200,
+ kSoundStatusClear4 = 0x800,
+ kSoundStatusClearAll = 0xFFFFFFE0
+};
+
//////////////////////////////////////////////////////////////////////////
// Time values
//////////////////////////////////////////////////////////////////////////
diff --git a/engines/lastexpress/sound/entry.h b/engines/lastexpress/sound/entry.h
index 6b0f780152..1ea3f5b821 100644
--- a/engines/lastexpress/sound/entry.h
+++ b/engines/lastexpress/sound/entry.h
@@ -76,27 +76,6 @@ namespace LastExpress {
class LastExpressEngine;
class SubtitleEntry;
-enum SoundStatus {
- kSoundStatus_20 = 0x20,
- kSoundStatus_40 = 0x40,
- kSoundStatus_180 = 0x180,
- kSoundStatusRemoved = 0x200,
- kSoundStatus_400 = 0x400,
-
- kSoundStatus_8000 = 0x8000,
- kSoundStatus_20000 = 0x20000,
- kSoundStatus_100000 = 0x100000,
- kSoundStatus_20000000 = 0x20000000,
- kSoundStatus_40000000 = 0x40000000,
-
- kSoundStatusClear0 = 0x10,
- kSoundStatusClear1 = 0x1F,
- kSoundStatusClear2 = 0x80,
- kSoundStatusClear3 = 0x200,
- kSoundStatusClear4 = 0x800,
- kSoundStatusClearAll = 0xFFFFFFE0
-};
-
union SoundStatusUnion {
uint32 status;
byte status1;