[Scummvm-cvs-logs] SF.net SVN: scummvm:[45916] scummvm/trunk/engines/teenagent
megath at users.sourceforge.net
megath at users.sourceforge.net
Sun Nov 15 11:54:29 CET 2009
Revision: 45916
http://scummvm.svn.sourceforge.net/scummvm/?rev=45916&view=rev
Author: megath
Date: 2009-11-15 10:54:29 +0000 (Sun, 15 Nov 2009)
Log Message:
-----------
added actor_talking flag
Modified Paths:
--------------
scummvm/trunk/engines/teenagent/scene.cpp
scummvm/trunk/engines/teenagent/scene.h
Modified: scummvm/trunk/engines/teenagent/scene.cpp
===================================================================
--- scummvm/trunk/engines/teenagent/scene.cpp 2009-11-15 10:49:57 UTC (rev 45915)
+++ scummvm/trunk/engines/teenagent/scene.cpp 2009-11-15 10:54:29 UTC (rev 45916)
@@ -36,7 +36,7 @@
Scene::Scene() : intro(false), _engine(NULL),
_system(NULL),
_id(0), ons(0),
- orientation(Object::kActorRight),
+ orientation(Object::kActorRight), actor_talking(false),
message_timer(0), message_first_frame(0), message_last_frame(0), message_animation(NULL),
current_event(SceneEvent::kNone), hide_actor(false), callback(0), callback_timer(0) {}
@@ -668,7 +668,7 @@
} else
busy = true;
} else
- actor_animation_position = teenagent.render(surface, position, orientation, 0, true);
+ actor_animation_position = teenagent.render(surface, position, orientation, 0, actor_talking);
}
}
Modified: scummvm/trunk/engines/teenagent/scene.h
===================================================================
--- scummvm/trunk/engines/teenagent/scene.h 2009-11-15 10:49:57 UTC (rev 45915)
+++ scummvm/trunk/engines/teenagent/scene.h 2009-11-15 10:54:29 UTC (rev 45916)
@@ -187,6 +187,7 @@
typedef Common::List<Common::Point> Path;
Path path;
uint8 orientation;
+ bool actor_talking;
bool findPath(Path &p, const Common::Point &src, const Common::Point &dst) const;
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