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

[megath at users.sourceforge.net]

Revision: 44111
          http://scummvm.svn.sourceforge.net/scummvm/?rev=44111&view=rev
Author:   megath
Date:     2009-09-15 20:58:30 +0000 (Tue, 15 Sep 2009)

Log Message:
-----------
fixed animation pausing/restarting when only one of animations present

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

Modified: scummvm/trunk/engines/teenagent/dialog.cpp
===================================================================
--- scummvm/trunk/engines/teenagent/dialog.cpp	2009-09-15 20:57:49 UTC (rev 44110)
+++ scummvm/trunk/engines/teenagent/dialog.cpp	2009-09-15 20:58:30 UTC (rev 44111)
@@ -66,27 +66,28 @@
 			case 2:
 				//debug(0, "displaymessage\n");
 
-				if (color == color2 && animation2 != 0) {
+				if (color == color2) {
+					
 					//pause animation in other slot
-					{
+					if (animation1 != 0) {
 						SceneEvent e(SceneEvent::kPauseAnimation);
 						e.lan = 0x80 | slot1;
 						scene->push(e);
 					}
-					{
+					if (animation2 != 0) {
 						SceneEvent e(SceneEvent::kPlayAnimation);
 						e.animation = animation2;
 						e.lan = 0x80 | slot2;
 						scene->push(e);
 					}
-				} else if (color == color1 && animation1 != 0) {
+				} else if (color == color1) {
 					//pause animation in other slot
-					{
+					if (animation2 != 0) {
 						SceneEvent e(SceneEvent::kPauseAnimation);
 						e.lan = 0x80 | slot2;
 						scene->push(e);
 					}
-					{
+					if (animation1 != 0) {
 						SceneEvent e(SceneEvent::kPlayAnimation);
 						e.animation = animation1;
 						e.lan = 0x80 | slot1;


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