From 137f0e4ca3910beccca28a028b785247a380c209 Mon Sep 17 00:00:00 2001 From: Max Horn Date: Thu, 5 Aug 2004 21:25:58 +0000 Subject: 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 --- scumm/script.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'scumm') 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 -- cgit v1.2.3