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

[megath at users.sourceforge.net]

Revision: 47969
          http://scummvm.svn.sourceforge.net/scummvm/?rev=47969&view=rev
Author:   megath
Date:     2010-02-07 17:13:39 +0000 (Sun, 07 Feb 2010)

Log Message:
-----------
added setFlag, fixed non-mark's messages

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

Modified: scummvm/trunk/engines/teenagent/teenagent.cpp
===================================================================
--- scummvm/trunk/engines/teenagent/teenagent.cpp	2010-02-07 17:12:52 UTC (rev 47968)
+++ scummvm/trunk/engines/teenagent/teenagent.cpp	2010-02-07 17:13:39 UTC (rev 47969)
@@ -147,7 +147,7 @@
 		if (object->actor_rect.valid())
 			scene->moveTo(dst, object->actor_orientation);
 		dst_object = object;
-	} else if (!scene_busy || action == kActionNone) {
+	} else if (!scene_busy) {
 		//do not reset anything while scene is busy, but allow interrupts while walking.
 		debug(0, "click %d, %d", point.x, point.y);
 		action = kActionNone;
@@ -608,7 +608,7 @@
 		return;
 	}
 
-	{
+	if (color == 0xd1) { //mark's
 		SceneEvent e(SceneEvent::kPlayAnimation);
 		e.animation = 0;
 		e.slot = 0x80;
@@ -796,6 +796,14 @@
 	scene->push(event);
 }
 
+void TeenAgentEngine::setFlag(uint16 addr, byte value) {
+	SceneEvent event(SceneEvent::kSetFlag);
+	event.callback = addr;
+	event.color = value;
+	scene->push(event);
+}
+
+
 void TeenAgentEngine::reloadLan() {
 	SceneEvent event(SceneEvent::kSetLan);
 	event.lan = 0;

Modified: scummvm/trunk/engines/teenagent/teenagent.h
===================================================================
--- scummvm/trunk/engines/teenagent/teenagent.h	2010-02-07 17:12:52 UTC (rev 47968)
+++ scummvm/trunk/engines/teenagent/teenagent.h	2010-02-07 17:13:39 UTC (rev 47969)
@@ -95,6 +95,7 @@
 	void loadScene(byte id, uint16 x, uint16 y, byte o = 0);
 	void setOns(byte id, byte value, byte scene_id = 0);
 	void setLan(byte id, byte value, byte scene_id = 0);
+	void setFlag(uint16 addr, byte value);
 	void reloadLan();
 	void rejectMessage();
 


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