diff options
| -rw-r--r-- | engines/sci/engine/vm.h | 13 | ||||
| -rw-r--r-- | engines/sci/vocabulary.cpp | 4 | ||||
| -rw-r--r-- | engines/sci/vocabulary.h | 2 |
3 files changed, 8 insertions, 11 deletions
diff --git a/engines/sci/engine/vm.h b/engines/sci/engine/vm.h index d7703e371e..70802bb377 100644 --- a/engines/sci/engine/vm.h +++ b/engines/sci/engine/vm.h @@ -769,13 +769,13 @@ enum BreakpointType { * 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 @@ struct Breakpoint { 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_gc_interval; 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 diff --git a/engines/sci/vocabulary.cpp b/engines/sci/vocabulary.cpp index 216ab211be..accdcc9eb1 100644 --- a/engines/sci/vocabulary.cpp +++ b/engines/sci/vocabulary.cpp @@ -93,7 +93,7 @@ Vocabulary::Vocabulary(ResourceManager *resmgr) : _resmgr(resmgr) { 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 @@ void Vocabulary::freeSuffixes() { _parserSuffixes.clear(); } -bool Vocabulary::getBranches() { +bool Vocabulary::loadBranches() { Resource *resource = NULL; if (_vocabVersion == kVocabularySCI0) diff --git a/engines/sci/vocabulary.h b/engines/sci/vocabulary.h index c8ed146917..9f0d277ef2 100644 --- a/engines/sci/vocabulary.h +++ b/engines/sci/vocabulary.h @@ -278,7 +278,7 @@ private: * @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 |