diff options
| author | Max Horn | 2010-05-26 16:30:10 +0000 |
|---|---|---|
| committer | Max Horn | 2010-05-26 16:30:10 +0000 |
| commit | 0197e9f6a19738054a4b847e3217cd3794ef3ce3 (patch) | |
| tree | c73642ea32bd9ce4ae2699e210446933ce94d984 /engines/sci/engine/seg_manager.cpp | |
| parent | 017507ffa6a774ea1df4d74b8431155540f76244 (diff) | |
| download | scummvm-rg350-0197e9f6a19738054a4b847e3217cd3794ef3ce3.tar.gz scummvm-rg350-0197e9f6a19738054a4b847e3217cd3794ef3ce3.tar.bz2 scummvm-rg350-0197e9f6a19738054a4b847e3217cd3794ef3ce3.zip | |
SCI: Making various object and script related things const
svn-id: r49246
Diffstat (limited to 'engines/sci/engine/seg_manager.cpp')
| -rw-r--r-- | engines/sci/engine/seg_manager.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/engines/sci/engine/seg_manager.cpp b/engines/sci/engine/seg_manager.cpp index b18d76e1a7..e0b6e75d70 100644 --- a/engines/sci/engine/seg_manager.cpp +++ b/engines/sci/engine/seg_manager.cpp @@ -156,7 +156,7 @@ int SegManager::deallocate(SegmentId seg, bool recursive) { } bool SegManager::isHeapObject(reg_t pos) { - Object *obj = getObject(pos); + const Object *obj = getObject(pos); if (obj == NULL || (obj && obj->isFreed())) return false; Script *scr = getScriptIfLoaded(pos.segment); @@ -234,7 +234,7 @@ Object *SegManager::getObject(reg_t pos) { } const char *SegManager::getObjectName(reg_t pos) { - Object *obj = getObject(pos); + const Object *obj = getObject(pos); if (!obj) return "<no such object>"; @@ -275,7 +275,7 @@ reg_t SegManager::findObjectByName(const Common::String &name, int index) { // It's a script or a clone table, scan all objects in it for (; idx < max_index; ++idx) { - Object *obj = NULL; + const Object *obj = NULL; reg_t objpos; objpos.offset = 0; objpos.segment = i; @@ -485,7 +485,7 @@ void SegManager::reconstructClones() { continue; CloneTable::Entry &seeker = ct->_table[j]; - Object *baseObj = getObject(seeker.getSpeciesSelector()); + const Object *baseObj = getObject(seeker.getSpeciesSelector()); seeker.cloneFromObject(baseObj); if (!baseObj) warning("Clone entry without a base class: %d", j); |