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

megath at users.sourceforge.net megath at users.sourceforge.net
Sat Sep 5 19:14:21 CEST 2009


Revision: 43963
          http://scummvm.svn.sourceforge.net/scummvm/?rev=43963&view=rev
Author:   megath
Date:     2009-09-05 17:14:20 +0000 (Sat, 05 Sep 2009)

Log Message:
-----------
added actor_animation for the dialog

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

Modified: scummvm/trunk/engines/teenagent/dialog.cpp
===================================================================
--- scummvm/trunk/engines/teenagent/dialog.cpp	2009-09-05 15:57:41 UTC (rev 43962)
+++ scummvm/trunk/engines/teenagent/dialog.cpp	2009-09-05 17:14:20 UTC (rev 43963)
@@ -28,7 +28,7 @@
 
 namespace TeenAgent {
 
-void Dialog::show(Scene * scene, uint16 addr, uint16 animation) {
+void Dialog::show(Scene * scene, uint16 addr, uint16 animation, uint16 actor_animation) {
 	debug(0, "Dialog::show(%04x, %u)", addr, animation);
 	Resources * res = Resources::instance();
 	int n = 0;
@@ -58,9 +58,15 @@
 					if (animation != 0) {
 						SceneEvent e(SceneEvent::PlayAnimation);
 						e.animation = animation;
-						e.color = 0x83; //3rd slot, async animation
+						e.color = 0x83; //4th slot, async animation
 						scene->push(e);
 					}
+					if (actor_animation != 0) {
+						SceneEvent e(SceneEvent::PlayAnimation);
+						e.animation = actor_animation;
+						e.color = 0x80; //1st slot, async animation
+						scene->push(e);
+					}
 					SceneEvent e(SceneEvent::Message);
 					e.message = message;
 					e.color = color;
@@ -90,7 +96,7 @@
 	}
 }
 
-uint16 Dialog::pop(Scene *scene, uint16 addr, uint16 animation) {
+uint16 Dialog::pop(Scene *scene, uint16 addr, uint16 animation, uint16 actor_animation) {
 	debug(0, "Dialog::pop(%04x, %u)", addr, animation);
 	Resources * res = Resources::instance();
 	uint16 next;
@@ -101,7 +107,7 @@
 	uint16 next2 = res->dseg.get_word(addr);
 	if (next2 != 0xffff)
 		res->dseg.set_word(addr - 2, 0);
-	show(scene, next, animation);
+	show(scene, next, animation, actor_animation);
 	return next;
 }
 

Modified: scummvm/trunk/engines/teenagent/dialog.h
===================================================================
--- scummvm/trunk/engines/teenagent/dialog.h	2009-09-05 15:57:41 UTC (rev 43962)
+++ scummvm/trunk/engines/teenagent/dialog.h	2009-09-05 17:14:20 UTC (rev 43963)
@@ -33,8 +33,8 @@
 class Scene;
 class Dialog {
 public: 
-	static uint16 pop(Scene *scene, uint16 addr, uint16 animation = 0);
-	static void show(Scene *scene, uint16 addr, uint16 animation = 0);
+	static uint16 pop(Scene *scene, uint16 addr, uint16 animation = 0, uint16 actor_animation = 0);
+	static void show(Scene *scene, uint16 addr, uint16 animation = 0, uint16 actor_animation = 0);
 };
 
 } // End of namespace TeenAgent


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




More information about the Scummvm-git-logs mailing list