SCI: Always use SegManager::getObjectName to get object names

This ensures that all object name reading code works the same and
is in one place in the codebase.

1 files changed, 4 insertions, 8 deletions

diff --git a/engines/sci/engine/guest_additions.cpp b/engines/sci/engine/guest_additions.cpp
index e2b7354bdf..23f600fe5f 100644
--- a/engines/sci/engine/guest_additions.cpp
+++ b/engines/sci/engine/guest_additions.cpp
@@ -359,14 +359,10 @@ static const byte SRDialogPatch[] = {
 };
 
 void GuestAdditions::patchGameSaveRestoreSCI32(Script &script) const {
-	ObjMap &objMap = script.getObjectMap();
-	for (ObjMap::iterator it = objMap.begin(); it != objMap.end(); ++it) {
-		Object &obj = it->_value;
-		if (obj.getNameSelector().isNull()) {
-			continue;
-		}
-
-		if (Common::String(_segMan->derefString(obj.getNameSelector())) != "SRDialog") {
+	const ObjMap &objMap = script.getObjectMap();
+	for (ObjMap::const_iterator it = objMap.begin(); it != objMap.end(); ++it) {
+		const Object &obj = it->_value;
+		if (strncmp(_segMan->getObjectName(obj.getPos()), "SRDialog", 8) != 0) {
 			continue;
 		}