X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=src%2Fobject%2Fpath_walker.cpp;h=d0d55ddfa416eb961dfc94e51ef61d60a58e6508;hb=5f1c84ed5ce0ab5450f92082a9aaaa9ca0effc39;hp=07c2b5ada38d277c7e5d14d10acd54999f0ba28f;hpb=07ddaed2a657e4d2a3d038fed223fc5827159caf;p=supertux.git

diff --git a/src/object/path_walker.cpp b/src/object/path_walker.cpp
index 07c2b5ada..d0d55ddfa 100644
--- a/src/object/path_walker.cpp
+++ b/src/object/path_walker.cpp
@@ -23,8 +23,8 @@
 #include <assert.h>
 #include "path_walker.hpp"
 
-PathWalker::PathWalker(const Path* path)
-  : path(path), current_node_nr(0), next_node_nr(0), node_time(0),
+PathWalker::PathWalker(const Path* path, bool running)
+  : path(path), running(running), current_node_nr(0), next_node_nr(0), stop_at_node_nr(running?-1:0), node_time(0),
     walking_speed(1.0)
 {
   last_pos = path->nodes[0].position;
@@ -39,6 +39,8 @@ PathWalker::~PathWalker()
 Vector
 PathWalker::advance(float elapsed_time)
 {
+  if (!running) return Vector(0,0);
+
   assert(elapsed_time >= 0);
 
   elapsed_time *= fabsf(walking_speed);
@@ -74,10 +76,33 @@ PathWalker::advance(float elapsed_time)
   return result;
 }
 
+void 
+PathWalker::goto_node(int node_no)
+{
+  if (node_no == stop_at_node_nr) return;
+  running = true;
+  stop_at_node_nr = node_no;
+}
+
+void 
+PathWalker::start_moving()
+{
+  running = true;
+  stop_at_node_nr = -1;
+}
+
+void 
+PathWalker::stop_moving()
+{
+  stop_at_node_nr = next_node_nr;
+}
+
+
 void
 PathWalker::advance_node()
 {
   current_node_nr = next_node_nr;
+  if (static_cast<int>(current_node_nr) == stop_at_node_nr) running = false;
 
   if(next_node_nr + 1 < path->nodes.size()) {
     next_node_nr++;