X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Fobject%2Fpath_walker.cpp;h=840e92438382351ff49a4912d6fb4294810e1a5a;hb=3546f9b659b3b2ec53b2bee45e6f81e755d9207f;hp=abb42bc1eed65059f7498898896e39ce7af3947d;hpb=a48ee7c0b3e60c9f21499054446aeaeca6914f46;p=supertux.git

diff --git a/src/object/path_walker.cpp b/src/object/path_walker.cpp
index abb42bc1e..840e92438 100644
--- a/src/object/path_walker.cpp
+++ b/src/object/path_walker.cpp
@@ -1,12 +1,10 @@
-//  $Id$
-//
 //  SuperTux
 //  Copyright (C) 2006 Matthias Braun <matze@braunis.de>
 //
-//  This program is free software; you can redistribute it and/or
-//  modify it under the terms of the GNU General Public License
-//  as published by the Free Software Foundation; either version 2
-//  of the License, or (at your option) any later version.
+//  This program is free software: you can redistribute it and/or modify
+//  it under the terms of the GNU General Public License as published by
+//  the Free Software Foundation, either version 3 of the License, or
+//  (at your option) any later version.
 //
 //  This program is distributed in the hope that it will be useful,
 //  but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -14,20 +12,23 @@
 //  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.
+//  along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-#include <config.h>
+#include "object/path_walker.hpp"
 
 #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), stop_at_node_nr(-1), node_time(0),
-    walking_speed(1.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),
+  node_mult(),
+  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;
 }
@@ -39,12 +40,12 @@ PathWalker::~PathWalker()
 Vector
 PathWalker::advance(float elapsed_time)
 {
-  if (static_cast<int>(current_node_nr) == stop_at_node_nr) return Vector(0,0);
+  if (!running) return path->nodes[current_node_nr].position;
 
   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;
@@ -63,42 +64,49 @@ PathWalker::advance(float elapsed_time)
       node_mult = 1 / path->nodes[next_node_nr].time;
     }
   }
-  
-  const Path::Node* next_node = & (path->nodes[next_node_nr]);
+
   node_time += elapsed_time * node_mult;
- 
-  Vector new_pos = current_node->position + 
+
+  return get_pos();
+}
+
+Vector
+PathWalker::get_pos()
+{
+  const Path::Node* current_node = & (path->nodes[current_node_nr]);
+  const Path::Node* next_node = & (path->nodes[next_node_nr]);
+  Vector new_pos = current_node->position +
     (next_node->position - current_node->position) * node_time;
-    
-  Vector result = new_pos - last_pos;
-  last_pos = new_pos;
-  
-  return result;
+
+  return new_pos;
 }
 
-void 
+void
 PathWalker::goto_node(int node_no)
 {
+  if (node_no == stop_at_node_nr) return;
+  running = true;
   stop_at_node_nr = node_no;
 }
 
-void 
+void
 PathWalker::start_moving()
 {
+  running = true;
   stop_at_node_nr = -1;
 }
 
-void 
+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++;
@@ -150,3 +158,5 @@ PathWalker::goback_node()
   next_node_nr = 0;
   walking_speed = 0;
 }
+
+/* EOF */