[Scummvm-cvs-logs] SF.net SVN: scummvm:[50387] scummvm/trunk/engines/sci/engine/script.cpp

[m_kiewitz at users.sourceforge.net]

Revision: 50387
          http://scummvm.svn.sourceforge.net/scummvm/?rev=50387&view=rev
Author:   m_kiewitz
Date:     2010-06-27 18:41:07 +0000 (Sun, 27 Jun 2010)

Log Message:
-----------
SCI: fixing regression from one of the merges

Modified Paths:
--------------
    scummvm/trunk/engines/sci/engine/script.cpp

Modified: scummvm/trunk/engines/sci/engine/script.cpp
===================================================================
--- scummvm/trunk/engines/sci/engine/script.cpp	2010-06-27 18:19:37 UTC (rev 50386)
+++ scummvm/trunk/engines/sci/engine/script.cpp	2010-06-27 18:41:07 UTC (rev 50387)
@@ -345,7 +345,7 @@
 
 		if ((objType == SCI_OBJ_OBJECT) || (objType == SCI_OBJ_CLASS)) { // object or class?
 			reg.offset += 8;	// magic offset (SCRIPT_OBJECT_MAGIC_OFFSET)
-			int superclass = READ_SCI11ENDIAN_UINT16(scr->_buf + reg.offset + 2);
+			int16 superclass = READ_SCI11ENDIAN_UINT16(scr->_buf + reg.offset + 2);
 
 			if (superclass >= 0) {
 				int superclass_script = segMan->getClass(superclass).script;


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.