[Scummvm-cvs-logs] scummvm master -> 0360b4ac95e08d6350f63b0801557ebed9a90796

wjp wjp at usecode.org
Sun Mar 13 18:28:58 CET 2011


This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
0360b4ac95 SCI: Add reference to related bug to comment


Commit: 0360b4ac95e08d6350f63b0801557ebed9a90796
    https://github.com/scummvm/scummvm/commit/0360b4ac95e08d6350f63b0801557ebed9a90796
Author: Willem Jan Palenstijn (wjp at usecode.org)
Date: 2011-03-13T10:28:01-07:00

Commit Message:
SCI: Add reference to related bug to comment

Changed paths:
    engines/sci/engine/object.cpp



diff --git a/engines/sci/engine/object.cpp b/engines/sci/engine/object.cpp
index d8b62fa..a4e5d47 100644
--- a/engines/sci/engine/object.cpp
+++ b/engines/sci/engine/object.cpp
@@ -175,13 +175,13 @@ bool Object::initBaseObject(SegManager *segMan, reg_t addr, bool doInitSuperClas
 		if (_variables.size() != baseObj->getVarCount()) {
 			warning("Object %04x:%04x varnum doesn't match baseObj's: obj %d, base %d ", PRINT_REG(_pos), _variables.size(), baseObj->getVarCount());
 			// These objects are probably broken.
-			// An example is 'witchCage' in script 200 in KQ5, but also
-			// 'girl' in script 216 and 'door' in script 22.
+			// An example is 'witchCage' in script 200 in KQ5 (#3034714),
+			// but also 'girl' in script 216 and 'door' in script 22.
 			// In LSL3 a number of sound objects trigger this right away.
+			// SQ4-floppy's bug #3037938 also seems related.
 
 			// The effect is that a number of its method selectors may be
 			// treated as variable selectors, causing unpredictable effects.
-			// In the case of KQ5/witchCage, this caused bug #3034714.
 		}
 		_variables.resize(baseObj->getVarCount());
 		// Copy base from species class, as we need its selector IDs






More information about the Scummvm-git-logs mailing list