[Scummvm-cvs-logs] SF.net SVN: scummvm:[49544] scummvm/trunk/engines/sci

[thebluegr at users.sourceforge.net]

Revision: 49544
          http://scummvm.svn.sourceforge.net/scummvm/?rev=49544&view=rev
Author:   thebluegr
Date:     2010-06-09 15:28:14 +0000 (Wed, 09 Jun 2010)

Log Message:
-----------
Proper fix for kernel name loading (regression from commit #49537)

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

Modified: scummvm/trunk/engines/sci/engine/kernel.cpp
===================================================================
--- scummvm/trunk/engines/sci/engine/kernel.cpp	2010-06-09 15:21:10 UTC (rev 49543)
+++ scummvm/trunk/engines/sci/engine/kernel.cpp	2010-06-09 15:28:14 UTC (rev 49544)
@@ -394,6 +394,7 @@
 Kernel::Kernel(ResourceManager *resMan, SegManager *segMan) : _resMan(resMan), _segMan(segMan) {
 	loadSelectorNames();
 	mapSelectors();      // Map a few special selectors for later use
+	loadKernelNames();	// must be called after the selectors are set
 }
 
 Kernel::~Kernel() {

Modified: scummvm/trunk/engines/sci/engine/kernel.h
===================================================================
--- scummvm/trunk/engines/sci/engine/kernel.h	2010-06-09 15:21:10 UTC (rev 49543)
+++ scummvm/trunk/engines/sci/engine/kernel.h	2010-06-09 15:28:14 UTC (rev 49544)
@@ -207,6 +207,7 @@
 	 */
 	Common::String lookupText(reg_t address, int index);
 
+private:
 	/**
 	 * Loads the kernel function names.
 	 *
@@ -217,7 +218,6 @@
 	 */
 	void loadKernelNames();
 
-private:
 	/**
 	 * Sets the default kernel function names, based on the SCI version used
 	 */

Modified: scummvm/trunk/engines/sci/sci.cpp
===================================================================
--- scummvm/trunk/engines/sci/sci.cpp	2010-06-09 15:21:10 UTC (rev 49543)
+++ scummvm/trunk/engines/sci/sci.cpp	2010-06-09 15:28:14 UTC (rev 49544)
@@ -217,7 +217,6 @@
 	}
 
 	script_adjust_opcode_formats(_gamestate);
-	_kernel->loadKernelNames();
 
 	SciVersion soundVersion = _features->detectDoSoundType();
 


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