aboutsummaryrefslogtreecommitdiff
path: root/engines/teenagent/dialog.cpp
diff options
context:
space:
mode:
authorVladimir Menshakov2009-10-18 10:46:42 +0000
committerVladimir Menshakov2009-10-18 10:46:42 +0000
commit3a8a872a8f96232fd8cb23e6e7801ebe540fa02d (patch)
tree5e681996ca9584301aeccfa0a8ccd969121f7d84 /engines/teenagent/dialog.cpp
parenta10929594d951ec31d8f4e4ec0e17178ca0d8a58 (diff)
downloadscummvm-rg350-3a8a872a8f96232fd8cb23e6e7801ebe540fa02d.tar.gz
scummvm-rg350-3a8a872a8f96232fd8cb23e6e7801ebe540fa02d.tar.bz2
scummvm-rg350-3a8a872a8f96232fd8cb23e6e7801ebe540fa02d.zip
fixed long standing bug with empty messages being processed
svn-id: r45216
Diffstat (limited to 'engines/teenagent/dialog.cpp')
-rw-r--r--engines/teenagent/dialog.cpp10
1 files changed, 6 insertions, 4 deletions
diff --git a/engines/teenagent/dialog.cpp b/engines/teenagent/dialog.cpp
index a968d0e298..8adbde4ba9 100644
--- a/engines/teenagent/dialog.cpp
+++ b/engines/teenagent/dialog.cpp
@@ -61,13 +61,12 @@ void Dialog::show(Scene *scene, uint16 addr, uint16 animation1, uint16 animation
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 @@ void Dialog::show(Scene *scene, uint16 addr, uint16 animation1, uint16 animation
}
{
+ message.trim();
+ if (message.empty())
+ break;
SceneEvent e(SceneEvent::kMessage);
e.message = message;
e.color = color;