[Scummvm-cvs-logs] SF.net SVN: scummvm:[50584] scummvm/trunk/engines/sci/engine/seg_manager. cpp

[mthreepwood at users.sourceforge.net]

Revision: 50584
          http://scummvm.svn.sourceforge.net/scummvm/?rev=50584&view=rev
Author:   mthreepwood
Date:     2010-07-01 23:13:42 +0000 (Thu, 01 Jul 2010)

Log Message:
-----------
Only print the ambiguous object notice in findObjectByName if we didn't specify an index.

Modified Paths:
--------------
    scummvm/trunk/engines/sci/engine/seg_manager.cpp

Modified: scummvm/trunk/engines/sci/engine/seg_manager.cpp
===================================================================
--- scummvm/trunk/engines/sci/engine/seg_manager.cpp	2010-07-01 23:12:45 UTC (rev 50583)
+++ scummvm/trunk/engines/sci/engine/seg_manager.cpp	2010-07-01 23:13:42 UTC (rev 50584)
@@ -300,14 +300,11 @@
 	if (result.empty())
 		return NULL_REG;
 
-	if (result.size() > 1) {
+	if (result.size() > 1 && index < 0) {
 		printf("Ambiguous:\n");
 		for (i = 0; i < result.size(); i++)
 			printf("  %3x: [%04x:%04x] %s\n", i, PRINT_REG(result[i]), name.c_str());
-		if (index < 0) {
-			printf("Ambiguous: Aborting.\n");
-			return NULL_REG; // Ambiguous
-		}
+		return NULL_REG; // Ambiguous
 	}
 
 	if (index < 0)


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.