Made buttjump a bit easier to perform

[supertux.git] / src / object / path.cpp

diff --git a/src/object/path.cpp b/src/object/path.cpp
index e4c415e..5d7e88a 100644 (file)
--- a/src/object/path.cpp
+++ b/src/object/path.cpp
@@ -1,5 +1,5 @@
 //  $Id$
-// 
+//
 //  SuperTux Path
 //  Copyright (C) 2005 Philipp <balinor@pnxs.de>
 //  Copyright (C) 2006 Christoph Sommer <christoph.sommer@2006.expires.deltadevelopment.de>
@@ -14,7 +14,7 @@
 //  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
@@ -23,10 +23,11 @@
 
 #include "path.hpp"
 
+#include "lisp/writer.hpp"
 #include "lisp/lisp.hpp"
 #include "lisp/list_iterator.hpp"
 #include "object_factory.hpp"
-#include "msg.hpp"
+#include "log.hpp"
 
 #include <assert.h>
 #include <iostream>
@@ -51,7 +52,7 @@ Path::read(const lisp::Lisp& reader)
     if(iter.item() == "mode") {
       std::string mode_string;
       if(!iter.value()->get(mode_string))
-        throw new std::runtime_error("Pathmode not a string");
+        throw std::runtime_error("Pathmode not a string");
 
       if(mode_string == "oneshot")
         mode = ONE_SHOT;
@@ -62,13 +63,13 @@ Path::read(const lisp::Lisp& reader)
       else {
         std::ostringstream msg;
         msg << "Unknown pathmode '" << mode_string << "' found";
-        throw new std::runtime_error(msg.str());
+        throw std::runtime_error(msg.str());
       }
       continue;
     }
-    
+
     if(iter.item() != "node") {
-      msg_warning("unknown token '" << iter.item() << "' in Path nodes list. Ignored.");
+      log_warning << "unknown token '" << iter.item() << "' in Path nodes list. Ignored." << std::endl;
       continue;
     }
     const lisp::Lisp* node_lisp = iter.lisp();
@@ -78,7 +79,7 @@ Path::read(const lisp::Lisp& reader)
     node.time = 1;
     if( (!node_lisp->get("x", node.position.x) ||
           !node_lisp->get("y", node.position.y)))
-      throw new std::runtime_error("Path node without x and y coordinate specified");
+      throw std::runtime_error("Path node without x and y coordinate specified");
     node_lisp->get("time", node.time);
 
     if(node.time <= 0)
@@ -107,7 +108,7 @@ Path::write(lisp::Writer& writer)
       writer.write_string("mode", "circular");
       break;
     default:
-      msg_warning("Don't know how to write mode " << (int) mode << " ?!?");
+      log_warning << "Don't know how to write mode " << (int) mode << " ?!?" << std::endl;
       break;
   }
 
@@ -130,7 +131,39 @@ Path::get_base() const
 {
   if(nodes.empty())
     return Vector(0, 0);
-  
+
   return nodes[0].position;
 }
 
+int
+Path::get_nearest_node_no(Vector reference_point) const
+{
+  int nearest_node_id = -1;
+  float nearest_node_dist = 0;
+  int id = 0;
+  for (std::vector<Node>::const_iterator i = nodes.begin(); i != nodes.end(); i++, id++) {
+    float dist = (i->position - reference_point).norm();
+    if ((nearest_node_id == -1) || (dist < nearest_node_dist)) {
+      nearest_node_id = id;
+      nearest_node_dist = dist;
+    }
+  }
+  return nearest_node_id;
+}
+
+int
+Path::get_farthest_node_no(Vector reference_point) const
+{
+  int farthest_node_id = -1;
+  float farthest_node_dist = 0;
+  int id = 0;
+  for (std::vector<Node>::const_iterator i = nodes.begin(); i != nodes.end(); i++, id++) {
+    float dist = (i->position - reference_point).norm();
+    if ((farthest_node_id == -1) || (dist > farthest_node_dist)) {
+      farthest_node_id = id;
+      farthest_node_dist = dist;
+    }
+  }
+  return farthest_node_id;
+}
+