[Scummvm-cvs-logs] scummvm master -> d6a32470589a2c1d77ae9bc67031362cd03df657

whoozle whoozle at yandex.ru
Wed Nov 2 21:47:43 CET 2011


This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
d6a3247058 TEENAGENT: Added robot's dialogue animation.


Commit: d6a32470589a2c1d77ae9bc67031362cd03df657
    https://github.com/scummvm/scummvm/commit/d6a32470589a2c1d77ae9bc67031362cd03df657
Author: Vladimir Menshakov (whoozle at yandex.ru)
Date: 2011-11-02T13:46:47-07:00

Commit Message:
TEENAGENT: Added robot's dialogue animation.

Changed paths:
    engines/teenagent/callbacks.cpp



diff --git a/engines/teenagent/callbacks.cpp b/engines/teenagent/callbacks.cpp
index 29f8049..8882531 100644
--- a/engines/teenagent/callbacks.cpp
+++ b/engines/teenagent/callbacks.cpp
@@ -3221,7 +3221,8 @@ bool TeenAgentEngine::processCallback(uint16 addr) {
 		return true;
 
 	case 0x6c83:
-		Dialog::pop(scene, 0xdb2e, 0, 0, 0xd1, 0xef, 0, 1);
+		waitLanAnimationFrame(1, 1);
+		Dialog::pop(scene, 0xdb2e, 0, 727, 0xd1, 0xef, 0, 1);
 		scene->getObject(1)->setName((const char *)res->dseg.ptr(0xaa94));
 		SET_FLAG(0xDBD1, 1);
 		return true;
@@ -3557,8 +3558,9 @@ bool TeenAgentEngine::processCallback(uint16 addr) {
 		playSound(5, 39);
 		displayAsyncMessage(0x5124, 40388, 9, 35, 0xd0);
 		playActorAnimation(728);
-		//fixme: add 727 animation
-		Dialog::show(scene, 0x3d17, 0, 0, 0xd1, 0xef, 0, 1);
+
+		waitLanAnimationFrame(1, 1);
+		Dialog::show(scene, 0x3d17, 0, 727, 0xd1, 0xef, 0, 1);
 		SET_FLAG(0xDBD2, 1);
 		processCallback(0x9175);
 		return true;
@@ -3572,13 +3574,14 @@ bool TeenAgentEngine::processCallback(uint16 addr) {
 			return true;
 		}
 		displayMessage(0x5138);
-		waitLanAnimationFrame(1, 1);
 
+		waitLanAnimationFrame(1, 1);
 		playSound(5, 3);
 		playSound(5, 23);
 		playActorAnimation(729);
-		//fixme: add 727 animation
-		Dialog::show(scene, 0x3d70, 0, 0, 0xd1, 0xef, 0, 1);
+
+		waitLanAnimationFrame(1, 1);
+		Dialog::show(scene, 0x3d70, 0, 727, 0xd1, 0xef, 0, 1);
 		SET_FLAG(0xDBD3, 1);
 		processCallback(0x9175);
 		return true;
@@ -3597,8 +3600,9 @@ bool TeenAgentEngine::processCallback(uint16 addr) {
 		playSound(5, 3);
 		playSound(5, 25);
 		playActorAnimation(730);
-		//fixme: add 727 animation
-		Dialog::show(scene, 0x3dd6, 0, 0, 0xd1, 0xef, 0, 1);
+
+		waitLanAnimationFrame(1, 1);
+		Dialog::show(scene, 0x3dd6, 0, 727, 0xd1, 0xef, 0, 1);
 		SET_FLAG(0xDBD4, 1);
 		processCallback(0x9175);
 		return true;






More information about the Scummvm-git-logs mailing list