aboutsummaryrefslogtreecommitdiff
path: root/engines/titanic/sound/wave_file.cpp
diff options
context:
space:
mode:
authorPaul Gilbert2017-02-09 22:12:56 -0500
committerPaul Gilbert2017-02-09 22:12:56 -0500
commit4adea6eaced8d6281a5d50ffaa3bfb4906af96a4 (patch)
tree50283a718e1098bdca1d07dfbd2e5a292eb51432 /engines/titanic/sound/wave_file.cpp
parentabe4f20fc1649bf2f6b111034a4044b4b6b2846f (diff)
downloadscummvm-rg350-4adea6eaced8d6281a5d50ffaa3bfb4906af96a4.tar.gz
scummvm-rg350-4adea6eaced8d6281a5d50ffaa3bfb4906af96a4.tar.bz2
scummvm-rg350-4adea6eaced8d6281a5d50ffaa3bfb4906af96a4.zip
TITANIC: FIxes and cleanup for instrument mixer code
Diffstat (limited to 'engines/titanic/sound/wave_file.cpp')
-rw-r--r--engines/titanic/sound/wave_file.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/engines/titanic/sound/wave_file.cpp b/engines/titanic/sound/wave_file.cpp
index a328fe1543..0d9d86d714 100644
--- a/engines/titanic/sound/wave_file.cpp
+++ b/engines/titanic/sound/wave_file.cpp
@@ -165,18 +165,18 @@ void CWaveFile::reset() {
audioStream()->rewind();
}
-const byte *CWaveFile::lock() {
+const uint16 *CWaveFile::lock() {
switch (_loadMode) {
case LOADMODE_SCUMMVM:
assert(_waveData);
- return _waveData + _headerSize;
+ return (uint16 *)(_waveData + _headerSize);
default:
return nullptr;
}
}
-void CWaveFile::unlock(const byte *ptr) {
+void CWaveFile::unlock(const uint16 *ptr) {
// No implementation needed in ScummVM
}