aboutsummaryrefslogtreecommitdiff
path: root/engines/scumm/sound.h
diff options
context:
space:
mode:
authorMax Horn2006-04-23 23:00:32 +0000
committerMax Horn2006-04-23 23:00:32 +0000
commite80d24aa22e5e83a86b28454d23241f3574eef1f (patch)
tree58852fa7ad03cfd0d79f21b3cee69a04a3446c60 /engines/scumm/sound.h
parent91831974a86e5964f24c745c45ea3ed75589ac2e (diff)
downloadscummvm-rg350-e80d24aa22e5e83a86b28454d23241f3574eef1f.tar.gz
scummvm-rg350-e80d24aa22e5e83a86b28454d23241f3574eef1f.tar.bz2
scummvm-rg350-e80d24aa22e5e83a86b28454d23241f3574eef1f.zip
Some more cleanup in class Scumm::Sound
svn-id: r22125
Diffstat (limited to 'engines/scumm/sound.h')
-rw-r--r--engines/scumm/sound.h11
1 files changed, 1 insertions, 10 deletions
diff --git a/engines/scumm/sound.h b/engines/scumm/sound.h
index 4966bfb7a3..bf28cc9f3a 100644
--- a/engines/scumm/sound.h
+++ b/engines/scumm/sound.h
@@ -84,15 +84,6 @@ protected:
int16 _currentCDSound;
int16 _currentMusic;
-public: // Used by createSound()
- struct {
- int sound;
- int codeOffs;
- int priority;
- int sbngBlock;
- int soundVars[27];
- } _heChannel[8];
-
public:
Audio::SoundHandle _talkChannelHandle; // Handle of mixer channel actor is talking on
@@ -113,7 +104,7 @@ public:
virtual int isSoundRunning(int sound) const;
bool isSoundInUse(int sound) const;
virtual void stopSound(int sound);
- void stopAllSounds();
+ virtual void stopAllSounds();
void soundKludge(int *list, int num);
void talkSound(uint32 a, uint32 b, int mode, int channel = 0);
virtual void setupSound();