diff options
author | Vladimir Menshakov | 2009-11-15 10:54:29 +0000 |
---|---|---|
committer | Vladimir Menshakov | 2009-11-15 10:54:29 +0000 |
commit | f0b2b924b1388679cd8be2f7c5110f18e92990d4 (patch) | |
tree | 5ec9218a1b773e30691dd5ed7150cdad67744d19 | |
parent | cae613cb05b5537519e0e811adc4610d3aef0eda (diff) | |
download | scummvm-rg350-f0b2b924b1388679cd8be2f7c5110f18e92990d4.tar.gz scummvm-rg350-f0b2b924b1388679cd8be2f7c5110f18e92990d4.tar.bz2 scummvm-rg350-f0b2b924b1388679cd8be2f7c5110f18e92990d4.zip |
added actor_talking flag
svn-id: r45916
-rw-r--r-- | engines/teenagent/scene.cpp | 4 | ||||
-rw-r--r-- | engines/teenagent/scene.h | 1 |
2 files changed, 3 insertions, 2 deletions
diff --git a/engines/teenagent/scene.cpp b/engines/teenagent/scene.cpp index 2f7c8efb82..ad064e954f 100644 --- a/engines/teenagent/scene.cpp +++ b/engines/teenagent/scene.cpp @@ -36,7 +36,7 @@ namespace TeenAgent { 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 @@ bool Scene::render(OSystem *system) { } 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); } } diff --git a/engines/teenagent/scene.h b/engines/teenagent/scene.h index 8ca1646448..0b0df298fe 100644 --- a/engines/teenagent/scene.h +++ b/engines/teenagent/scene.h @@ -187,6 +187,7 @@ private: 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; |