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

[megath at users.sourceforge.net]

Revision: 45216
          http://scummvm.svn.sourceforge.net/scummvm/?rev=45216&view=rev
Author:   megath
Date:     2009-10-18 10:46:42 +0000 (Sun, 18 Oct 2009)

Log Message:
-----------
fixed long standing bug with empty messages being processed

Modified Paths:
--------------
    scummvm/trunk/engines/teenagent/callbacks.cpp
    scummvm/trunk/engines/teenagent/dialog.cpp
    scummvm/trunk/engines/teenagent/scene.cpp

Modified: scummvm/trunk/engines/teenagent/callbacks.cpp
===================================================================
--- scummvm/trunk/engines/teenagent/callbacks.cpp	2009-10-18 10:40:36 UTC (rev 45215)
+++ scummvm/trunk/engines/teenagent/callbacks.cpp	2009-10-18 10:46:42 UTC (rev 45216)
@@ -618,10 +618,9 @@
 		if (CHECK_FLAG(0xdbda, 1)) { //papers are shown
 			loadScene(5, 124, 199);
 		} else {
-			playAnimation(809, 1, true);
-			Dialog::show(scene, 0x5FE9);
+			Dialog::show(scene, 0x5FE9, 0, 809, 0xd1, 0xd0, 0, 1);
 			moveTo(269, 175, 4);
-			Dialog::pop(scene, 0xDB56);
+			Dialog::pop(scene, 0xDB56, 0, 809, 0xd1, 0xd0, 0, 1);
 		}
 		return true;
 

Modified: scummvm/trunk/engines/teenagent/dialog.cpp
===================================================================
--- scummvm/trunk/engines/teenagent/dialog.cpp	2009-10-18 10:40:36 UTC (rev 45215)
+++ scummvm/trunk/engines/teenagent/dialog.cpp	2009-10-18 10:46:42 UTC (rev 45216)
@@ -61,13 +61,12 @@
 			switch (n) {
 			case 1:
 				//debug(0, "new line\n");
-				message += '\n';
+				if (!message.empty())
+					message += '\n';
 				break;
 			case 2:
-				//debug(0, "displaymessage\n");
-
+				//debug(0, "displaymessage %s", message.c_str());
 				if (color == color2) {
-					
 					//pause animation in other slot
 					if (animation1 != 0) {
 						SceneEvent e(SceneEvent::kPauseAnimation);
@@ -96,6 +95,9 @@
 				}
 
 				{
+					message.trim();
+					if (message.empty())
+						break;
 					SceneEvent e(SceneEvent::kMessage);
 					e.message = message;
 					e.color = color;

Modified: scummvm/trunk/engines/teenagent/scene.cpp
===================================================================
--- scummvm/trunk/engines/teenagent/scene.cpp	2009-10-18 10:40:36 UTC (rev 45215)
+++ scummvm/trunk/engines/teenagent/scene.cpp	2009-10-18 10:46:42 UTC (rev 45216)
@@ -655,7 +655,8 @@
 }
 
 void Scene::displayMessage(const Common::String &str, byte color) {
-	debug(0, "displayMessage: %s", str.c_str());
+	//assert(!str.empty());
+	//debug(0, "displayMessage: %s", str.c_str());
 	message = str;
 	message_pos = messagePosition(str, position);
 	message_color = color;


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