diff options
| author | Max Horn | 2004-08-05 21:25:58 +0000 |
|---|---|---|
| committer | Max Horn | 2004-08-05 21:25:58 +0000 |
| commit | 137f0e4ca3910beccca28a028b785247a380c209 (patch) | |
| tree | e5fa4f4bf8d23659b617c7ada580f2186b767953 | |
| parent | 378491faf90470ce8daf746c9720594c053b36ee (diff) | |
| download | scummvm-rg350-137f0e4ca3910beccca28a028b785247a380c209.tar.gz scummvm-rg350-137f0e4ca3910beccca28a028b785247a380c209.tar.bz2 scummvm-rg350-137f0e4ca3910beccca28a028b785247a380c209.zip | |
Disable this workaround for COMI, as it causes a regression there. Actually, maybe we should just remove this again completely; we can 'work around' it by allowing more obj name resources, ultimately...
svn-id: r14475
| -rw-r--r-- | scumm/script.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/scumm/script.cpp b/scumm/script.cpp index 7aea832dfe..d9c816681c 100644 --- a/scumm/script.cpp +++ b/scumm/script.cpp @@ -873,7 +873,7 @@ void ScummEngine::killScriptsAndResources() { // We can delete custom name resources if either the object is // no longer in use (i.e. not owned by anyone anymore); or if // it is an object which is owned by a room. - if (owner == 0 || owner == OF_OWNER_ROOM) { + if (owner == 0 || (_version < 8 && owner == OF_OWNER_ROOM)) { // WORKAROUND for a problem mentioned in bug report #941275: // In FOA in the sentry room, in the chest plate of the statue, // the pegs may be renamed to mouth: this custom name is lost |