thirdparty/scummvm
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

SCI: Stop making copies of ObjMap and remove related dead code

Browse source 
ObjMap owns Objects, so every time this map gets copied instead of
referenced, it creates a copy of every single object in the
associated script. This is expensive, and it breaks things like
the `Object::syncBaseObject` call in savegame.cpp, which hasn't
actually been doing anything since
58190c36b4 because it has been
operating on copies.
This commit is contained in:
Colin Snover 2017-05-20 19:50:56 -05:00
parent 66efb750a0
commit 881be25fcd
3 changed files with 7 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

12
engines/sci/console.cpp
View file

@ -2175,11 +2175,11 @@ bool Console::segmentInfo(int nr) {
else
debugPrintf(" Locals : none\n");
ObjMap objects = scr->getObjectMap();
const ObjMap &objects = scr->getObjectMap();
debugPrintf(" Objects: %4d\n", objects.size());
ObjMap::iterator it;
const ObjMap::iterator end = objects.end();
ObjMap::const_iterator it;
const ObjMap::const_iterator end = objects.end();
for (it = objects.begin(); it != end; ++it) {
debugPrintf(" ");
// Object header
@ -3546,9 +3546,9 @@ 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 = objects.end();
const ObjMap &objects = script->getObjectMap();
ObjMap::const_iterator it;
const ObjMap::const_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());