[Scummvm-cvs-logs] SF.net SVN: scummvm:[45311] scummvm/trunk/engines/sci/engine/vm.cpp
thebluegr at users.sourceforge.net
thebluegr at users.sourceforge.net
Wed Oct 21 21:23:37 CEST 2009
Revision: 45311
http://scummvm.svn.sourceforge.net/scummvm/?rev=45311&view=rev
Author: thebluegr
Date: 2009-10-21 19:23:37 +0000 (Wed, 21 Oct 2009)
Log Message:
-----------
Removed the accidental inclusion of deprecated code for LSL5 - this has been superseded by commit 45297
Modified Paths:
--------------
scummvm/trunk/engines/sci/engine/vm.cpp
Modified: scummvm/trunk/engines/sci/engine/vm.cpp
===================================================================
--- scummvm/trunk/engines/sci/engine/vm.cpp 2009-10-21 19:19:03 UTC (rev 45310)
+++ scummvm/trunk/engines/sci/engine/vm.cpp 2009-10-21 19:23:37 UTC (rev 45311)
@@ -1608,7 +1608,6 @@
objlength = 0;
reg.offset = magic_pos_adder; // Reset counter
- reg_t egoClass = segMan->findObjectByName("Ego");
do {
reg_t addr;
@@ -1639,25 +1638,6 @@
obj->_baseObj = baseObj->_baseObj;
obj->setSuperClassSelector(INST_LOOKUP_CLASS(obj->getSuperClassSelector().offset));
-
- // Check if the game is trying to change an object that has Ego as its superclass
- if (!egoClass.isNull() && obj->getSuperClassSelector() == egoClass) {
- reg_t stopGroopPos = segMan->findObjectByName("stopGroop");
- debugC(2, "ego changed, updating stopGroop");
-
- // Notify the stopGroop object that Ego changed
- if (!stopGroopPos.isNull()) {
- Object *stopGroopObj = segMan->getObject(stopGroopPos);
-
- // Find the client member variable, and update it
- ObjVarRef varp;
- if (lookup_selector(segMan, stopGroopPos, ((SciEngine*)g_engine)->getKernel()->_selectorCache.client, &varp, NULL) == kSelectorVariable) {
- reg_t *clientVar = varp.getPointer(segMan);
- *clientVar = addr;
- }
- }
-
- }
} // if object or class
break;
case SCI_OBJ_POINTERS: // A relocation table
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
More information about the Scummvm-git-logs
mailing list