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

[fingolfin at users.sourceforge.net]

Revision: 40771
          http://scummvm.svn.sourceforge.net/scummvm/?rev=40771&view=rev
Author:   fingolfin
Date:     2009-05-21 21:49:43 +0000 (Thu, 21 May 2009)

Log Message:
-----------
SCI: got rid of vocabulary_lookup_sname

Modified Paths:
--------------
    scummvm/trunk/engines/sci/engine/scriptdebug.cpp
    scummvm/trunk/engines/sci/vocab_debug.cpp
    scummvm/trunk/engines/sci/vocabulary.h

Modified: scummvm/trunk/engines/sci/engine/scriptdebug.cpp
===================================================================
--- scummvm/trunk/engines/sci/engine/scriptdebug.cpp	2009-05-21 17:49:51 UTC (rev 40770)
+++ scummvm/trunk/engines/sci/engine/scriptdebug.cpp	2009-05-21 21:49:43 UTC (rev 40771)
@@ -2157,7 +2157,7 @@
 	reg_t *vptr;
 	reg_t fptr;
 
-	selector_id = vocabulary_lookup_sname(s->_selectorNames, selector_name);
+	selector_id = script_find_selector(s, selector_name);
 
 	if (selector_id < 0) {
 		sciprintf("Unknown selector: \"%s\"\n", selector_name);

Modified: scummvm/trunk/engines/sci/vocab_debug.cpp
===================================================================
--- scummvm/trunk/engines/sci/vocab_debug.cpp	2009-05-21 17:49:51 UTC (rev 40770)
+++ scummvm/trunk/engines/sci/vocab_debug.cpp	2009-05-21 21:49:43 UTC (rev 40771)
@@ -83,15 +83,6 @@
 	return true;
 }
 
-int vocabulary_lookup_sname(const Common::StringList &selectorNames, const char *sname) {
-	for (uint pos = 0; pos < selectorNames.size(); ++pos) {
-		if (selectorNames[pos] == sname)
-			return pos;
-	}
-
-	return -1;
-}
-
 void vocabulary_get_opcodes(ResourceManager *resmgr, Common::Array<opcode> &o) {
 	int count, i = 0;
 	Resource* r = resmgr->findResource(kResourceTypeVocab, VOCAB_RESOURCE_OPCODES, 0);

Modified: scummvm/trunk/engines/sci/vocabulary.h
===================================================================
--- scummvm/trunk/engines/sci/vocabulary.h	2009-05-21 17:49:51 UTC (rev 40770)
+++ scummvm/trunk/engines/sci/vocabulary.h	2009-05-21 21:49:43 UTC (rev 40771)
@@ -194,10 +194,6 @@
  */
 bool vocabulary_get_snames(ResourceManager *resmgr, bool isOldSci0, Common::StringList &selectorNames);
 
-/* Look up a selector name in an array, return the index */
-int vocabulary_lookup_sname(const Common::StringList &selectorNames, const char *sname);
-
-
 /**
  * Obtain the list of opcodes.
  */


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