aboutsummaryrefslogtreecommitdiff
path: root/engines/sci/engine/scriptdebug.cpp
diff options
context:
space:
mode:
authorMax Horn2009-02-23 03:04:52 +0000
committerMax Horn2009-02-23 03:04:52 +0000
commit9744fc615ca646f3d963675905c07d18bd0fa62d (patch)
tree5bf0fdc9037a542d0e11e46182c1cb8403b3112d /engines/sci/engine/scriptdebug.cpp
parent327f5c9f7720ec2ed3b2e7281ee33238ae536fc3 (diff)
downloadscummvm-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/engine/scriptdebug.cpp')
-rw-r--r--engines/sci/engine/scriptdebug.cpp10
1 files changed, 5 insertions, 5 deletions
diff --git a/engines/sci/engine/scriptdebug.cpp b/engines/sci/engine/scriptdebug.cpp
index eaa39f777c..6de049f84e 100644
--- a/engines/sci/engine/scriptdebug.cpp
+++ b/engines/sci/engine/scriptdebug.cpp
@@ -1173,8 +1173,8 @@ int c_stack(EngineState *s) {
}
const char *selector_name(EngineState *s, int selector) {
- if (selector >= 0 && selector < s->selector_names_nr)
- return s->selector_names[selector];
+ if (selector >= 0 && selector < (int)s->_selectorNames.size())
+ return s->_selectorNames[selector].c_str();
else
return "--INVALID--";
}
@@ -1422,7 +1422,7 @@ reg_t disassemble(EngineState *s, reg_t pos, int print_bw_tag, int print_bytecod
if (!name)
name = "<invalid>";
- sciprintf(" %s::%s[", name, (selector > s->selector_names_nr) ? "<invalid>" : selector_name(s, selector));
+ sciprintf(" %s::%s[", name, (selector > s->_selectorNames.size()) ? "<invalid>" : selector_name(s, selector));
switch (lookup_selector(s, called_obj_addr, selector, &val_ref, &fun_ref)) {
case SELECTOR_METHOD:
@@ -1557,7 +1557,7 @@ static int c_backtrace(EngineState *s) {
case EXEC_STACK_TYPE_VARSELECTOR:
sciprintf(" %x:[%x] vs%s %s::%s (", i, call->origin, (call->argc) ? "write" : "read",
- objname, s->selector_names[call->selector]);
+ objname, s->_selectorNames[call->selector].c_str());
break;
}
@@ -2155,7 +2155,7 @@ static int c_send(EngineState *s) {
reg_t *vptr;
reg_t fptr;
- selector_id = vocabulary_lookup_sname(s->selector_names, selector_name);
+ selector_id = vocabulary_lookup_sname(s->_selectorNames, selector_name);
if (selector_id < 0) {
sciprintf("Unknown selector: \"%s\"\n", selector_name);