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

megath at users.sourceforge.net megath at users.sourceforge.net
Tue Dec 1 08:54:50 CET 2009


Revision: 46226
          http://scummvm.svn.sourceforge.net/scummvm/?rev=46226&view=rev
Author:   megath
Date:     2009-12-01 07:54:50 +0000 (Tue, 01 Dec 2009)

Log Message:
-----------
display '&' next to the object name as in original game.

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

Modified: scummvm/trunk/engines/teenagent/inventory.cpp
===================================================================
--- scummvm/trunk/engines/teenagent/inventory.cpp	2009-12-01 06:09:08 UTC (rev 46225)
+++ scummvm/trunk/engines/teenagent/inventory.cpp	2009-12-01 07:54:50 UTC (rev 46226)
@@ -274,11 +274,12 @@
 	}
 
 	Common::String name;
-	if (inventory->selected_obj && inventory->selected_obj != inventory->hovered_obj) {
+	if (inventory->selected_obj) {
 		name = inventory->selected_obj->name;
 		name += " & ";
 	}
-	name += obj->name;
+	if (inventory->selected_obj != inventory->hovered_obj)
+		name += obj->name;
 
 	if (hovered && inventory->_engine->scene->getMessage().empty()) {
 		int w = res->font7.render(NULL, 0, 0, name, 0xd1, true);


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




More information about the Scummvm-git-logs mailing list