libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2025-01-29 14:42:26 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

SCI: cleanup

Browse Source 
svn-id: r41165
This commit is contained in:
Max Horn 2009-06-04 11:44:55 +00:00
parent 28242d289b
commit 4f08dc538c
3 changed files with 8 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
engines/sci/engine/vm.h
View File

@ -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

4
engines/sci/vocabulary.cpp
View File

@ -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)

2
engines/sci/vocabulary.h
View File

@ -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