diff options
| author | Max Horn | 2009-02-23 03:04:52 +0000 |
|---|---|---|
| committer | Max Horn | 2009-02-23 03:04:52 +0000 |
| commit | 9744fc615ca646f3d963675905c07d18bd0fa62d (patch) | |
| tree | 5bf0fdc9037a542d0e11e46182c1cb8403b3112d /engines/sci/include | |
| parent | 327f5c9f7720ec2ed3b2e7281ee33238ae536fc3 (diff) | |
| download | scummvm-rg350-9744fc615ca646f3d963675905c07d18bd0fa62d.tar.gz scummvm-rg350-9744fc615ca646f3d963675905c07d18bd0fa62d.tar.bz2 scummvm-rg350-9744fc615ca646f3d963675905c07d18bd0fa62d.zip | |
SCI: Changed selector name table to a Common::StringList
svn-id: r38805
Diffstat (limited to 'engines/sci/include')
| -rw-r--r-- | engines/sci/include/engine.h | 3 | ||||
| -rw-r--r-- | engines/sci/include/script.h | 2 | ||||
| -rw-r--r-- | engines/sci/include/vocabulary.h | 12 |
3 files changed, 6 insertions, 11 deletions
diff --git a/engines/sci/include/engine.h b/engines/sci/include/engine.h index a7d1c49cd9..b8d8ff5b65 100644 --- a/engines/sci/include/engine.h +++ b/engines/sci/include/engine.h @@ -253,8 +253,7 @@ struct EngineState { SegManager *seg_manager; int gc_countdown; /* Number of kernel calls until next gc */ - int selector_names_nr; /* Number of selector names */ - char **selector_names; /* Zero-terminated selector name list */ + Common::StringList _selectorNames; int kernel_names_nr; /* Number of kernel function names */ char **kernel_names; /* List of kernel names */ diff --git a/engines/sci/include/script.h b/engines/sci/include/script.h index eb53e1d5aa..5871eea67c 100644 --- a/engines/sci/include/script.h +++ b/engines/sci/include/script.h @@ -58,7 +58,7 @@ enum script_object_types { sci_obj_localvars }; -void script_dissect(ResourceManager *resmgr, int res_no, char **snames, int snames_nr); +void script_dissect(ResourceManager *resmgr, int res_no, const Common::StringList &selectorNames); /* Opcode formats as used by script.c */ enum opcode_format { diff --git a/engines/sci/include/vocabulary.h b/engines/sci/include/vocabulary.h index 9f9c3367bc..aac00f5319 100644 --- a/engines/sci/include/vocabulary.h +++ b/engines/sci/include/vocabulary.h @@ -198,17 +198,13 @@ int *vocabulary_get_classes(ResourceManager *resmgr, int *count); int vocabulary_get_class_count(ResourceManager *resmgr); /** - * Returns a null terminated array of selector names. + * Fills the given StringList with selector names. + * Returns true upon success, false oterwise. */ -char **vocabulary_get_snames(ResourceManager *resmgr, int *pcount, sci_version_t version); - -/** - * Frees the aforementioned array - */ -void vocabulary_free_snames(char **snames_list); +bool vocabulary_get_snames(ResourceManager *resmgr, sci_version_t version, Common::StringList &selectorNames); /* Look up a selector name in an array, return the index */ -int vocabulary_lookup_sname(char **snames_list, char *sname); +int vocabulary_lookup_sname(const Common::StringList &selectorNames, const char *sname); /** |