diff options
| author | Alyssa Milburn | 2012-09-25 17:32:34 +0200 |
|---|---|---|
| committer | Alyssa Milburn | 2012-09-25 17:32:34 +0200 |
| commit | 0093c4d13ec23af4b1e72f2caa2d879673397c54 (patch) | |
| tree | df895f9c2ac623b15c7559f3b0cd88efb21c6144 | |
| parent | dc6b98f64c131bdc4b1962f4a1552bc6e97fb29a (diff) | |
| download | scummvm-rg350-0093c4d13ec23af4b1e72f2caa2d879673397c54.tar.gz scummvm-rg350-0093c4d13ec23af4b1e72f2caa2d879673397c54.tar.bz2 scummvm-rg350-0093c4d13ec23af4b1e72f2caa2d879673397c54.zip | |
TONY: Don't error out on invalid ReleaseOwnership calls.
A script triggers this at the end of the scene where you give the
flowers to the bearded woman.
| -rw-r--r-- | engines/tony/custom.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/engines/tony/custom.cpp b/engines/tony/custom.cpp index 99debbfa0e..8cc459b493 100644 --- a/engines/tony/custom.cpp +++ b/engines/tony/custom.cpp @@ -1989,8 +1989,10 @@ void releaseOwnership(CORO_PARAM, uint32 num, uint32, uint32, uint32) { return; } - if (GLOBALS._mut[num]._ownerPid != (uint32)CoroScheduler.getCurrentPID()) - error("ReleaseOwnership tried to release mutex %d, which is held by a different process", num); + if (GLOBALS._mut[num]._ownerPid != (uint32)CoroScheduler.getCurrentPID()) { + warning("ReleaseOwnership tried to release mutex %d, which is held by a different process", num); + return; + } GLOBALS._mut[num]._lockCount--; if (!GLOBALS._mut[num]._lockCount) { |