aboutsummaryrefslogtreecommitdiff
path: root/scumm
diff options
context:
space:
mode:
authorMax Horn2003-10-17 17:05:19 +0000
committerMax Horn2003-10-17 17:05:19 +0000
commit4ae61964f2684f28931a2d88ab73f34a0efc3797 (patch)
treebf734b1876c055643a3707ffaac4ebf8543a8858 /scumm
parent8ab81c25339770912ea96680ff65e55d8f1c6236 (diff)
downloadscummvm-rg350-4ae61964f2684f28931a2d88ab73f34a0efc3797.tar.gz
scummvm-rg350-4ae61964f2684f28931a2d88ab73f34a0efc3797.tar.bz2
scummvm-rg350-4ae61964f2684f28931a2d88ab73f34a0efc3797.zip
cleanup
svn-id: r10874
Diffstat (limited to 'scumm')
-rw-r--r--scumm/sound.h5
1 files changed, 1 insertions, 4 deletions
diff --git a/scumm/sound.h b/scumm/sound.h
index de2a4c4e21..d37a907c11 100644
--- a/scumm/sound.h
+++ b/scumm/sound.h
@@ -38,11 +38,10 @@ class Sound {
protected:
int16 _soundQuePos, _soundQue[0x100];
int16 _soundQue2Pos, _soundQue2[10];
- bool _soundsPaused2;
- bool _soundVolumePreset;
public:
const char *_nameBundleMusic;
+ int32 _bundleMusicPosition;
protected:
const char *_newNameBundleMusic;
@@ -98,8 +97,6 @@ protected:
ScummEngine *_scumm;
public:
- int32 _bundleMusicPosition;
-
PlayingSoundHandle _talkChannelHandle; // Handle of mixer channel actor is talking on
bool _soundsPaused;
byte _sfxMode;