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

[fingolfin at users.sourceforge.net]

Revision: 44161
          http://scummvm.svn.sourceforge.net/scummvm/?rev=44161&view=rev
Author:   fingolfin
Date:     2009-09-17 14:54:11 +0000 (Thu, 17 Sep 2009)

Log Message:
-----------
SCI: Moved Kernel::findSelector from vocabulary.cpp to engine/kernel.cpp

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

Modified: scummvm/trunk/engines/sci/engine/kernel.cpp
===================================================================
--- scummvm/trunk/engines/sci/engine/kernel.cpp	2009-09-17 14:53:57 UTC (rev 44160)
+++ scummvm/trunk/engines/sci/engine/kernel.cpp	2009-09-17 14:54:11 UTC (rev 44161)
@@ -415,6 +415,17 @@
 		printf("new\n");
 }
 
+int Kernel::findSelector(const char *selectorName) const {
+	for (uint pos = 0; pos < _selectorNames.size(); ++pos) {
+		if (_selectorNames[pos] == selectorName)
+			return pos;
+	}
+
+	debugC(2, kDebugLevelVM, "Could not map '%s' to any selector\n", selectorName);
+
+	return -1;
+}
+
 void Kernel::loadSelectorNames() {
 	Resource *r = _resMan->findResource(ResourceId(kResourceTypeVocab, VOCAB_RESOURCE_SELECTORS), 0);
 	bool oldScriptHeader = (_resMan->sciVersion() == SCI_VERSION_0_EARLY);

Modified: scummvm/trunk/engines/sci/vocabulary.cpp
===================================================================
--- scummvm/trunk/engines/sci/vocabulary.cpp	2009-09-17 14:53:57 UTC (rev 44160)
+++ scummvm/trunk/engines/sci/vocabulary.cpp	2009-09-17 14:54:11 UTC (rev 44161)
@@ -467,17 +467,6 @@
 	con->DebugPrintf("\n");
 }
 
-int Kernel::findSelector(const char *selectorName) const {
-	for (uint pos = 0; pos < _selectorNames.size(); ++pos) {
-		if (_selectorNames[pos] == selectorName)
-			return pos;
-	}
-
-	debugC(2, kDebugLevelVM, "Could not map '%s' to any selector\n", selectorName);
-
-	return -1;
-}
-
 void _vocab_recursive_ptree_dump_treelike(parse_tree_node_t *nodes, int nr, int prevnr) {
 	if ((nr > VOCAB_TREE_NODES)/* || (nr < prevnr)*/) {
 		printf("Error(%04x)", nr);


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