[Scummvm-cvs-logs] CVS: scummvm/scumm script.cpp,1.171,1.172

[Max Horn]

Update of /cvsroot/scummvm/scummvm/scumm
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26393

Modified Files:
	script.cpp 
Log Message:
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...

Index: script.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/script.cpp,v
retrieving revision 1.171
retrieving revision 1.172
diff -u -d -r1.171 -r1.172
--- script.cpp	5 Aug 2004 10:59:51 -0000	1.171
+++ script.cpp	5 Aug 2004 21:25:58 -0000	1.172
@@ -873,7 +873,7 @@
 				// 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