diff options
| author | Max Horn | 2009-05-20 17:52:33 +0000 |
|---|---|---|
| committer | Max Horn | 2009-05-20 17:52:33 +0000 |
| commit | 4c786a44c941268356b711c2f374eedf9b7e4db8 (patch) | |
| tree | 67a4bc647742f29f69feeac0edc93555b729270d /engines/sci/vocabulary.h | |
| parent | 7d54385dea265b3fa26016a191fb6223203a5f27 (diff) | |
| download | scummvm-rg350-4c786a44c941268356b711c2f374eedf9b7e4db8.tar.gz scummvm-rg350-4c786a44c941268356b711c2f374eedf9b7e4db8.tar.bz2 scummvm-rg350-4c786a44c941268356b711c2f374eedf9b7e4db8.zip | |
SCI: Changed EngineState::opcodes to a Common::Array (maybe we shold just remove the relevant code completely, though, it seems useless, esp. as long as we hardcode the way we interpret every opcode
svn-id: r40740
Diffstat (limited to 'engines/sci/vocabulary.h')
| -rw-r--r-- | engines/sci/vocabulary.h | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/engines/sci/vocabulary.h b/engines/sci/vocabulary.h index 0ca8613844..b8dcee795c 100644 --- a/engines/sci/vocabulary.h +++ b/engines/sci/vocabulary.h @@ -49,7 +49,7 @@ class ResourceManager; struct opcode { int type; int number; - char* name; + Common::String name; }; #define VOCAB_RESOURCE_OPCODES 998 @@ -199,14 +199,9 @@ int vocabulary_lookup_sname(const Common::StringList &selectorNames, const char /** - * Returns a null terminated array of opcodes. + * Obtain the list of opcodes. */ -opcode *vocabulary_get_opcodes(ResourceManager *resmgr); - -void vocabulary_free_opcodes(opcode *opcodes); -/* Frees a previously allocated list of opcodes -** Parameters: (opcode *) opcodes: Opcodes to free -*/ +void vocabulary_get_opcodes(ResourceManager *resmgr, Common::Array<opcode> &opcodes); /** * Fills a StringList with kernel function names. |