diff options
| author | Max Horn | 2010-02-13 17:42:49 +0000 |
|---|---|---|
| committer | Max Horn | 2010-02-13 17:42:49 +0000 |
| commit | ac4d325e0d61b649026a5f5414f749697b285ccc (patch) | |
| tree | c58f62596d050be62e98180c0255e7998a9a62e4 /engines/sci/engine/selector.cpp | |
| parent | 24fd77eb242c4d90e8c3a3b0bcc5f0c48a4dc77f (diff) | |
| download | scummvm-rg350-ac4d325e0d61b649026a5f5414f749697b285ccc.tar.gz scummvm-rg350-ac4d325e0d61b649026a5f5414f749697b285ccc.tar.bz2 scummvm-rg350-ac4d325e0d61b649026a5f5414f749697b285ccc.zip | |
SCI: Add global g_sci pointer to the active SciEngine instance
svn-id: r48046
Diffstat (limited to 'engines/sci/engine/selector.cpp')
| -rw-r--r-- | engines/sci/engine/selector.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/engines/sci/engine/selector.cpp b/engines/sci/engine/selector.cpp index 41e0c435af..8a859b1431 100644 --- a/engines/sci/engine/selector.cpp +++ b/engines/sci/engine/selector.cpp @@ -187,7 +187,7 @@ reg_t read_selector(SegManager *segMan, reg_t object, Selector selector_id) { void write_selector(SegManager *segMan, reg_t object, Selector selector_id, reg_t value) { ObjVarRef address; - if ((selector_id < 0) || (selector_id > (int)((SciEngine*)g_engine)->getKernel()->getSelectorNamesSize())) { + if ((selector_id < 0) || (selector_id > (int)g_sci->getKernel()->getSelectorNamesSize())) { warning("Attempt to write to invalid selector %d of" " object at %04x:%04x.", selector_id, PRINT_REG(object)); return; @@ -195,7 +195,7 @@ void write_selector(SegManager *segMan, reg_t object, Selector selector_id, reg_ if (lookup_selector(segMan, object, selector_id, &address, NULL) != kSelectorVariable) warning("Selector '%s' of object at %04x:%04x could not be" - " written to", ((SciEngine*)g_engine)->getKernel()->getSelectorName(selector_id).c_str(), PRINT_REG(object)); + " written to", g_sci->getKernel()->getSelectorName(selector_id).c_str(), PRINT_REG(object)); else *address.getPointer(segMan) = value; } |