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

[fingolfin at users.sourceforge.net]

Revision: 43978
          http://scummvm.svn.sourceforge.net/scummvm/?rev=43978&view=rev
Author:   fingolfin
Date:     2009-09-06 12:56:28 +0000 (Sun, 06 Sep 2009)

Log Message:
-----------
SCI: Change script_lookup_export to use SegManager::validateExportFunc

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-09-06 12:53:43 UTC (rev 43977)
+++ scummvm/trunk/engines/sci/engine/vm.cpp	2009-09-06 12:56:28 UTC (rev 43978)
@@ -1507,8 +1507,7 @@
 
 reg_t script_lookup_export(SegManager *segManager, int script_nr, int export_index) {
 	SegmentId seg = segManager->getSegment(script_nr, SCRIPT_GET_DONT_LOAD);
-	Script *script = segManager->getScriptIfLoaded(seg);
-	return make_reg(seg, READ_LE_UINT16((byte *)(script->export_table + export_index)));
+	return make_reg(seg, segManager->validateExportFunc(export_index, seg));
 }
 
 #define INST_LOOKUP_CLASS(id) ((id == 0xffff)? NULL_REG : segManager->get_class_address(id, SCRIPT_GET_LOCK, reg))


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