diff options
author | Filippos Karapetis | 2011-11-05 10:07:03 +0200 |
---|---|---|
committer | Filippos Karapetis | 2011-11-05 10:07:03 +0200 |
commit | 58190c36b4cc84b3200239211d91b0291301db56 (patch) | |
tree | fb21e29ce777cc9750809e0195a698bb31355b53 /engines/sci/console.cpp | |
parent | 267c6f1756c9582b8bd9534334c7f264a2400929 (diff) | |
download | scummvm-rg350-58190c36b4cc84b3200239211d91b0291301db56.tar.gz scummvm-rg350-58190c36b4cc84b3200239211d91b0291301db56.tar.bz2 scummvm-rg350-58190c36b4cc84b3200239211d91b0291301db56.zip |
SCI: Made the object map hashmap of the Script class private
Diffstat (limited to 'engines/sci/console.cpp')
-rw-r--r-- | engines/sci/console.cpp | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/engines/sci/console.cpp b/engines/sci/console.cpp index 664fa6747b..b852de74a9 100644 --- a/engines/sci/console.cpp +++ b/engines/sci/console.cpp @@ -1881,11 +1881,12 @@ bool Console::segmentInfo(int nr) { else DebugPrintf(" Locals : none\n"); - DebugPrintf(" Objects: %4d\n", scr->_objects.size()); + ObjMap objects = scr->getObjectMap(); + DebugPrintf(" Objects: %4d\n", objects.size()); ObjMap::iterator it; - const ObjMap::iterator end = scr->_objects.end(); - for (it = scr->_objects.begin(); it != end; ++it) { + const ObjMap::iterator end = objects.end(); + for (it = objects.begin(); it != end; ++it) { DebugPrintf(" "); // Object header const Object *obj = _engine->_gamestate->_segMan->getObject(it->_value.getPos()); @@ -2942,9 +2943,10 @@ void Console::printKernelCallsFound(int kernelFuncNum, bool showFoundScripts) { script = customSegMan->getScript(scriptSegment); // Iterate through all the script's objects + ObjMap objects = script->getObjectMap(); ObjMap::iterator it; - const ObjMap::iterator end = script->_objects.end(); - for (it = script->_objects.begin(); it != end; ++it) { + const ObjMap::iterator end = objects.end(); + for (it = objects.begin(); it != end; ++it) { const Object *obj = customSegMan->getObject(it->_value.getPos()); const char *objName = customSegMan->getObjectName(it->_value.getPos()); |