diff options
| author | Colin Snover | 2017-06-07 19:55:45 -0500 |
|---|---|---|
| committer | Colin Snover | 2017-06-09 22:48:15 -0500 |
| commit | 4311d1b18274d25384c5492c27f0611db28d6c4a (patch) | |
| tree | 37387b7a64e668b4a58ef18cb3c56d31b0999019 | |
| parent | 095226a614be5f1d4d3d8b9b5b03c4127fdb33e2 (diff) | |
| download | scummvm-rg350-4311d1b18274d25384c5492c27f0611db28d6c4a.tar.gz scummvm-rg350-4311d1b18274d25384c5492c27f0611db28d6c4a.tar.bz2 scummvm-rg350-4311d1b18274d25384c5492c27f0611db28d6c4a.zip | |
SCI: Do not lock Audio36/Sync36 in kLock for SCI1.1
This is not known to fix any problem, but was a noted difference
in the implementation between ScummVM and SSCI.
| -rw-r--r-- | engines/sci/engine/kscripts.cpp | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/engines/sci/engine/kscripts.cpp b/engines/sci/engine/kscripts.cpp index 3dba4b127d..7bcbd0e359 100644 --- a/engines/sci/engine/kscripts.cpp +++ b/engines/sci/engine/kscripts.cpp @@ -67,6 +67,11 @@ reg_t kLock(EngineState *s, int argc, reg_t *argv) { const ResourceId id(type, argv[1].toUint16()); + if (getSciVersion() == SCI_VERSION_1_1 && + (type == kResourceTypeAudio36 || type == kResourceTypeSync36)) { + return s->r_acc; + } + Resource *which; switch (state) { |