[Scummvm-cvs-logs] scummvm master -> 5969c6bd2e141799d35d68559b9222772917e950

[bluegr]

This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
5969c6bd2e SCI: Updated Script::getObjectMap()


Commit: 5969c6bd2e141799d35d68559b9222772917e950
    https://github.com/scummvm/scummvm/commit/5969c6bd2e141799d35d68559b9222772917e950
Author: Filippos Karapetis (md5 at scummvm.org)
Date: 2011-11-05T04:08:42-07:00

Commit Message:
SCI: Updated Script::getObjectMap()

It now returns a reference to the object list instead of copying it

Changed paths:
    engines/sci/engine/script.h
    engines/sci/engine/seg_manager.cpp



diff --git a/engines/sci/engine/script.h b/engines/sci/engine/script.h
index 8c5495d..90a7c7a 100644
--- a/engines/sci/engine/script.h
+++ b/engines/sci/engine/script.h
@@ -87,7 +87,7 @@ public:
 	SegmentId getLocalsSegment() const { return _localsSegment; }
 	reg_t *getLocalsBegin() { return _localsBlock ? _localsBlock->_locals.begin() : NULL; }
 	void syncLocalsBlock(SegManager *segMan);
-	ObjMap getObjectMap() const { return _objects; }
+	ObjMap &getObjectMap() { return _objects; }
 
 public:
 	Script();
diff --git a/engines/sci/engine/seg_manager.cpp b/engines/sci/engine/seg_manager.cpp
index 09d586a..6722cda 100644
--- a/engines/sci/engine/seg_manager.cpp
+++ b/engines/sci/engine/seg_manager.cpp
@@ -269,7 +269,7 @@ reg_t SegManager::findObjectByName(const Common::String &name, int index) {
 
 		if (mobj->getType() == SEG_TYPE_SCRIPT) {
 			// It's a script, scan all objects in it
-			const Script *scr = (const Script *)mobj;
+			Script *scr = (Script *)mobj;
 			ObjMap objects = scr->getObjectMap();
 			for (ObjMap::const_iterator it = objects.begin(); it != objects.end(); ++it) {
 				objpos.offset = it->_value.getPos().offset;