aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPaweł Kołodziejski2004-04-05 20:07:04 +0000
committerPaweł Kołodziejski2004-04-05 20:07:04 +0000
commitf44291f6b65a15c3a3b4ee96374f05300493e068 (patch)
tree55e1e3eb3438046533a8b6bf3d02ca1def0b0f6c
parent04fe7f804340df0e38d7eb25d3cfa8ef0b6cb3e6 (diff)
downloadscummvm-rg350-f44291f6b65a15c3a3b4ee96374f05300493e068.tar.gz
scummvm-rg350-f44291f6b65a15c3a3b4ee96374f05300493e068.tar.bz2
scummvm-rg350-f44291f6b65a15c3a3b4ee96374f05300493e068.zip
remove usage VAR_SYNC. in scripts used only one time, it's set to 0
svn-id: r13472
-rw-r--r--TODO1
-rw-r--r--scumm/imuse_digi/dimuse.cpp8
2 files changed, 4 insertions, 5 deletions
diff --git a/TODO b/TODO
index 7ba0ea6b2f..6c3dcc0e30 100644
--- a/TODO
+++ b/TODO
@@ -259,7 +259,6 @@ SCUMM
- Recheck music code
- Add sound mixer procedure for pool method
- Change code to new mixer pool method procedure
- - Check if VAR_SYNC if it's set to nonzero value
- Add pool method for FT voc samples from resource
- Implement stuff for fadeParam in JUMP opcode (maybe never implemented)
- Recheck 'next region' code
diff --git a/scumm/imuse_digi/dimuse.cpp b/scumm/imuse_digi/dimuse.cpp
index 1c5721f33b..5108ab092f 100644
--- a/scumm/imuse_digi/dimuse.cpp
+++ b/scumm/imuse_digi/dimuse.cpp
@@ -726,7 +726,7 @@ int32 IMuseDigital::getCurMusicPosInMs() {
int32 IMuseDigital::getCurVoiceLipSyncWidth() {
Common::StackLock lock(_mutex, "IMuseDigital::getCutVoiceLipSyncWidth()");
- int32 msPos = getPosInMs(kTalkSoundID) + _vm->VAR(_vm->VAR_SYNC) + 50;
+ int32 msPos = getPosInMs(kTalkSoundID) + 50;
int32 width = 0, height = 0;
debug(5, "IMuseDigital::getCurVoiceLipSyncWidth(%d)", kTalkSoundID);
@@ -736,7 +736,7 @@ int32 IMuseDigital::getCurVoiceLipSyncWidth() {
int32 IMuseDigital::getCurVoiceLipSyncHeight() {
Common::StackLock lock(_mutex, "IMuseDigital::getCurVoiceLipSyncHeight()");
- int32 msPos = getPosInMs(kTalkSoundID) + _vm->VAR(_vm->VAR_SYNC) + 50;
+ int32 msPos = getPosInMs(kTalkSoundID) + 50;
int32 width = 0, height = 0;
debug(5, "IMuseDigital::getCurVoiceLipSyncHeight(%d)", kTalkSoundID);
@@ -754,7 +754,7 @@ int32 IMuseDigital::getCurMusicLipSyncWidth(int syncId) {
}
}
- int32 msPos = getPosInMs(soundId) + _vm->VAR(_vm->VAR_SYNC) + 50;
+ int32 msPos = getPosInMs(soundId) + 50;
int32 width = 0, height = 0;
debug(5, "IMuseDigital::getCurVoiceLipSyncWidth(%d, %d)", soundId, msPos);
@@ -772,7 +772,7 @@ int32 IMuseDigital::getCurMusicLipSyncHeight(int syncId) {
}
}
- int32 msPos = getPosInMs(soundId) + _vm->VAR(_vm->VAR_SYNC) + 50;
+ int32 msPos = getPosInMs(soundId) + 50;
int32 width = 0, height = 0;
debug(5, "IMuseDigital::getCurVoiceLipSyncHeight(%d, %d)", soundId, msPos);