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

fingolfin at users.sourceforge.net fingolfin at users.sourceforge.net
Thu Jun 4 13:44:55 CEST 2009


Revision: 41165
          http://scummvm.svn.sourceforge.net/scummvm/?rev=41165&view=rev
Author:   fingolfin
Date:     2009-06-04 11:44:55 +0000 (Thu, 04 Jun 2009)

Log Message:
-----------
SCI: cleanup

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

Modified: scummvm/trunk/engines/sci/engine/vm.h
===================================================================
--- scummvm/trunk/engines/sci/engine/vm.h	2009-06-04 11:35:17 UTC (rev 41164)
+++ scummvm/trunk/engines/sci/engine/vm.h	2009-06-04 11:44:55 UTC (rev 41165)
@@ -769,13 +769,13 @@
 	 * Break when selector is executed. data contains (char *) selector name
 	 * (in the format Object::Method)
 	 */
-	BREAK_SELECTOR = 1,
+	BREAK_SELECTOR,
 
 	/**
 	 * Break when an exported function is called. data contains
 	 * script_no << 16 | export_no.
 	 */
-	BREAK_EXPORT = 2
+	BREAK_EXPORT
 };
 
 struct Breakpoint {
@@ -797,7 +797,9 @@
 extern int script_abort_flag;
 
 /** Number of kernel calls in between gcs; should be < 50000 */
-#define GC_INTERVAL 32768
+enum {
+	GC_INTERVAL = 32768
+};
 
 /** Initially GC_DELAY, can be set at runtime */
 extern int script_gc_interval;
@@ -806,11 +808,6 @@
 extern int script_step_counter;
 
 
-typedef int kernel_function(struct EngineState *s);
-
-extern kernel_function* kfuncs[];
-extern int max_instance;
-
 /**
  * Executes function pubfunct of the specified script.
  * Parameters: (EngineState *) s: The state which is to be executed with

Modified: scummvm/trunk/engines/sci/vocabulary.cpp
===================================================================
--- scummvm/trunk/engines/sci/vocabulary.cpp	2009-06-04 11:35:17 UTC (rev 41164)
+++ scummvm/trunk/engines/sci/vocabulary.cpp	2009-06-04 11:44:55 UTC (rev 41165)
@@ -93,7 +93,7 @@
 
 	if (_resmgr->_sciVersion < SCI_VERSION_01_VGA && loadParserWords()) {
 		loadSuffixes();
-		if (getBranches())
+		if (loadBranches())
 			// Now build a GNF grammar out of this
 			_parserRules = buildGNF();
 	} else {
@@ -247,7 +247,7 @@
 	_parserSuffixes.clear();
 }
 
-bool Vocabulary::getBranches() {
+bool Vocabulary::loadBranches() {
 	Resource *resource = NULL;
 
 	if (_vocabVersion == kVocabularySCI0)

Modified: scummvm/trunk/engines/sci/vocabulary.h
===================================================================
--- scummvm/trunk/engines/sci/vocabulary.h	2009-06-04 11:35:17 UTC (rev 41164)
+++ scummvm/trunk/engines/sci/vocabulary.h	2009-06-04 11:44:55 UTC (rev 41165)
@@ -278,7 +278,7 @@
 	 * @param branches		The rules are stored into this Array
 	 * @return true on success, false on error
 	 */
-	bool getBranches();
+	bool loadBranches();
 
 	/* Frees a parser rule list as returned by vocab_build_gnf()
 	** Parameters: (parse_rule_list_t *) rule_list: The rule list to free


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




More information about the Scummvm-git-logs mailing list