diff options
author | johndoe123 | 2012-10-16 13:12:53 +0000 |
---|---|---|
committer | Willem Jan Palenstijn | 2013-05-08 20:47:31 +0200 |
commit | 2c4f0b70fe4103891f8ffd99e0ea3f8788a90b31 (patch) | |
tree | d0a89d3157bda50d2e06ab8679846baaee35a4f5 /engines | |
parent | f5c7070ace26b95a52303ceb51893d2032ad8241 (diff) | |
download | scummvm-rg350-2c4f0b70fe4103891f8ffd99e0ea3f8788a90b31.tar.gz scummvm-rg350-2c4f0b70fe4103891f8ffd99e0ea3f8788a90b31.tar.bz2 scummvm-rg350-2c4f0b70fe4103891f8ffd99e0ea3f8788a90b31.zip |
NEVERHOOD: Add Entity::setSoundPan and use it in the DiskplayerScene
Diffstat (limited to 'engines')
-rw-r--r-- | engines/neverhood/diskplayerscene.cpp | 2 | ||||
-rw-r--r-- | engines/neverhood/entity.cpp | 4 | ||||
-rw-r--r-- | engines/neverhood/entity.h | 1 |
3 files changed, 6 insertions, 1 deletions
diff --git a/engines/neverhood/diskplayerscene.cpp b/engines/neverhood/diskplayerscene.cpp index 65bbc0ddb5..ac51ea1550 100644 --- a/engines/neverhood/diskplayerscene.cpp +++ b/engines/neverhood/diskplayerscene.cpp @@ -265,7 +265,7 @@ DiskplayerSlot::DiskplayerSlot(NeverhoodEngine *vm, DiskplayerScene *diskplayerS _appearSlot->setVisible(false); _activeSlot->setVisible(false); loadSound(0, 0x46210074); - // TODO sound panning stuff + setSoundPan(0, elementIndex * 100 / 19); } else if (elementIndex != 20) { _activeSlot = _diskplayerScene->addSprite(new StaticSprite(_vm, kDiskplayerSlotFileHashes4[_elementIndex], 1100)); _activeSlot->setVisible(false); diff --git a/engines/neverhood/entity.cpp b/engines/neverhood/entity.cpp index f66d129e26..36137a6fb5 100644 --- a/engines/neverhood/entity.cpp +++ b/engines/neverhood/entity.cpp @@ -150,6 +150,10 @@ void Entity::setSoundVolume(uint index, int volume) { getSoundResource(index)->setVolume(volume); } +void Entity::setSoundPan(uint index, int pan) { + getSoundResource(index)->setPan(pan); +} + void Entity::deleteSoundResources() { if (_soundResources) { for (uint i = 0; i < kMaxSoundResources; ++i) diff --git a/engines/neverhood/entity.h b/engines/neverhood/entity.h index 4bcd0c4e33..0b3e32c5e8 100644 --- a/engines/neverhood/entity.h +++ b/engines/neverhood/entity.h @@ -111,6 +111,7 @@ protected: void stopSound(uint index); bool isSoundPlaying(uint index); void setSoundVolume(uint index, int volume); + void setSoundPan(uint index, int pan); void deleteSoundResources(); }; |