[Scummvm-cvs-logs] SF.net SVN: scummvm:[47975] scummvm/trunk/engines/teenagent/inventory.cpp

[megath at users.sourceforge.net]

Revision: 47975
          http://scummvm.svn.sourceforge.net/scummvm/?rev=47975&view=rev
Author:   megath
Date:     2010-02-07 17:47:34 +0000 (Sun, 07 Feb 2010)

Log Message:
-----------
do not trigger combine for the one object

Modified Paths:
--------------
    scummvm/trunk/engines/teenagent/inventory.cpp

Modified: scummvm/trunk/engines/teenagent/inventory.cpp
===================================================================
--- scummvm/trunk/engines/teenagent/inventory.cpp	2010-02-07 17:46:29 UTC (rev 47974)
+++ scummvm/trunk/engines/teenagent/inventory.cpp	2010-02-07 17:47:34 UTC (rev 47975)
@@ -186,6 +186,8 @@
 
 		int id1 = selected_obj->id;
 		int id2 = hovered_obj->id;
+		if (id1 == id2)
+			return true;
 
 		debug(0, "combine(%u, %u)!", id1, id2);
 		byte *table = res->dseg.ptr(0xC335);


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