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

[megath at users.sourceforge.net]

Revision: 45925
          http://scummvm.svn.sourceforge.net/scummvm/?rev=45925&view=rev
Author:   megath
Date:     2009-11-15 17:49:26 +0000 (Sun, 15 Nov 2009)

Log Message:
-----------
hide mouse while displaying messages, hide item name while displaying item's description.

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

Modified: scummvm/trunk/engines/teenagent/inventory.cpp
===================================================================
--- scummvm/trunk/engines/teenagent/inventory.cpp	2009-11-15 17:43:47 UTC (rev 45924)
+++ scummvm/trunk/engines/teenagent/inventory.cpp	2009-11-15 17:49:26 UTC (rev 45925)
@@ -280,7 +280,7 @@
 	}
 	name += obj->name;
 
-	if (hovered) {
+	if (hovered && inventory->_engine->scene->getMessage().empty()) {
 		int w = res->font7.render(NULL, 0, 0, name, 0xd1, true);
 		res->font7.render(dst, (320 - w) / 2, 180, name, 0xd1, true);
 	}

Modified: scummvm/trunk/engines/teenagent/scene.h
===================================================================
--- scummvm/trunk/engines/teenagent/scene.h	2009-11-15 17:43:47 UTC (rev 45924)
+++ scummvm/trunk/engines/teenagent/scene.h	2009-11-15 17:49:26 UTC (rev 45925)
@@ -150,6 +150,7 @@
 	void loadObjectData();
 	Animation * getAnimation(byte slot);
 	inline Animation * getActorAnimation() { return &actor_animation; }
+	inline const Common::String& getMessage() const { return message; }
 
 private:
 	void loadOns();

Modified: scummvm/trunk/engines/teenagent/teenagent.cpp
===================================================================
--- scummvm/trunk/engines/teenagent/teenagent.cpp	2009-11-15 17:43:47 UTC (rev 45924)
+++ scummvm/trunk/engines/teenagent/teenagent.cpp	2009-11-15 17:49:26 UTC (rev 45925)
@@ -278,7 +278,6 @@
 	Common::Point mouse;
 
 	do {
-		_system->showMouse(true);
 		uint32 t0 = _system->getMillis();
 		Object *current_object = scene->findObject(mouse);
 
@@ -323,6 +322,7 @@
 			}
 		}
 
+		_system->showMouse(scene->getMessage().empty());
 		uint32 f0 = frame * 10 / 25, f1 = (frame + 1) * 10 / 25;
 		if (f0 != f1) {
 			bool b = scene->render(_system);


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