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

diff --git a/src/object/path_walker.cpp b/src/object/path_walker.cpp
index fa3669bc9..d0d55ddfa 100644
--- a/src/object/path_walker.cpp
+++ b/src/object/path_walker.cpp
@@ -1,8 +1,6 @@
-//  $Id: path.hpp 3114 2006-03-23 23:47:04Z sommer $
-// 
-//  SuperTux Path
-//  Copyright (C) 2005 Philipp <balinor@pnxs.de>
-//  Copyright (C) 2006 Christoph Sommer <christoph.sommer@2006.expires.deltadevelopment.de>
+//  $Id$
+//
+//  SuperTux
 //  Copyright (C) 2006 Matthias Braun <matze@braunis.de>
 //
 //  This program is free software; you can redistribute it and/or
@@ -14,22 +12,24 @@
 //  but WITHOUT ANY WARRANTY; without even the implied warranty of
 //  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 //  GNU General Public License for more details.
-// 
+//
 //  You should have received a copy of the GNU General Public License
 //  along with this program; if not, write to the Free Software
-//  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-//  02111-1307, USA.
+//  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+
 #include <config.h>
 
 #include <math.h>
+#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;
   node_mult = 1 / path->nodes[0].time;
+  next_node_nr = path->nodes.size() > 1 ? 1 : 0;
 }
 
 PathWalker::~PathWalker()
@@ -39,13 +39,15 @@ PathWalker::~PathWalker()
 Vector
 PathWalker::advance(float elapsed_time)
 {
+  if (!running) return Vector(0,0);
+
   assert(elapsed_time >= 0);
 
   elapsed_time *= fabsf(walking_speed);
   
   const Path::Node* current_node = & (path->nodes[current_node_nr]);
   while(node_time + elapsed_time * node_mult >= 1) {
-    elapsed_time -= (1 - node_time) * node_mult;
+    elapsed_time -= (1 - node_time) / node_mult;
 
     if(walking_speed > 0) {
       advance_node();
@@ -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++;
@@ -119,6 +144,7 @@ PathWalker::goback_node()
   switch(path->mode) {
     case Path::PING_PONG:
       walking_speed = -walking_speed;
+      next_node_nr = path->nodes.size() > 1 ? 1 : 0;
       return;
     default:
       break;