diff options
| author | johndoe123 | 2014-04-26 00:08:37 +0200 |
|---|---|---|
| committer | Eugene Sandulenko | 2018-07-20 06:43:33 +0000 |
| commit | ad2c0aaf3d81688f9c575eef64b571cb73249997 (patch) | |
| tree | 188ab3b052b4340b8ee7b17c5dc550ae6dd4c4f9 /engines/illusions/scriptresource.cpp | |
| parent | 9885a050f2e9b718e3fb7bab224dcfdc18292231 (diff) | |
| download | scummvm-rg350-ad2c0aaf3d81688f9c575eef64b571cb73249997.tar.gz scummvm-rg350-ad2c0aaf3d81688f9c575eef64b571cb73249997.tar.bz2 scummvm-rg350-ad2c0aaf3d81688f9c575eef64b571cb73249997.zip | |
ILLUSIONS: Add sound effects
- Fix priority bugs in Duckman
- Add more script and sequence opcodes
Diffstat (limited to 'engines/illusions/scriptresource.cpp')
| -rw-r--r-- | engines/illusions/scriptresource.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/engines/illusions/scriptresource.cpp b/engines/illusions/scriptresource.cpp index 2054d4dede..18a258aa6c 100644 --- a/engines/illusions/scriptresource.cpp +++ b/engines/illusions/scriptresource.cpp @@ -158,12 +158,13 @@ void TriggerObject::load(byte *dataStart, Common::SeekableReadStream &stream) { bool TriggerObject::findTriggerCause(uint32 verbId, uint32 objectId2, uint32 &codeOffs) { if ((verbId & 0xFFFF0000) == 0) { - for (uint i = 0; i < _causesCount; ++i) + for (uint i = 0; i < _causesCount; ++i) { if ((verbId == 7 && ((_causes[i]._verbId == 7 && _causes[i]._objectId2 == objectId2) || _causes[i]._verbId == 8)) || - verbId == _causes[i]._verbId) { + (verbId != 7 && verbId == _causes[i]._verbId)) { codeOffs = _causes[i]._codeOffs; return true; } + } } else { for (uint i = 0; i < _causesCount; ++i) if (_causes[i]._verbId == verbId && _causes[i]._objectId2 == objectId2) { |