X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=src%2Fobject%2Fplatform.cpp;h=b0b2a3b1c1bce0c23d44d778b89598f36cc6388e;hb=2bfc38ef3208dee885452cfa59a7c7df671eb24d;hp=b3c0dc52d26bd6bbd69c9a1fdf2f8f557fcc38dc;hpb=a15b670f9fb343da5a2398880cfacf2655aefdec;p=supertux.git

diff --git a/src/object/platform.cpp b/src/object/platform.cpp
index b3c0dc52d..b0b2a3b1c 100644
--- a/src/object/platform.cpp
+++ b/src/object/platform.cpp
@@ -1,7 +1,7 @@
 //  $Id$
 //
 //  SuperTux
-//  Copyright (C) 2005 Marek Moeckel <wansti@gmx.de>
+//  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
@@ -12,48 +12,50 @@
 //  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 "platform.hpp"
+
+#include <stdexcept>
+#include "log.hpp"
 #include "video/drawing_context.hpp"
 #include "resources.hpp"
 #include "player.hpp"
+#include "path.hpp"
+#include "path_walker.hpp"
 #include "sprite/sprite_manager.hpp"
 #include "lisp/lisp.hpp"
 #include "object_factory.hpp"
 
 Platform::Platform(const lisp::Lisp& reader)
 {
-  std::string use_path;
-  std::string type;
+  std::string sprite_name;
+  reader.get("sprite", sprite_name);
+  if(sprite_name == "")
+    throw std::runtime_error("No sprite specified in platform object"); 
+  sprite.reset(sprite_manager->create(sprite_name));
 
-  reader.get("x", bbox.p1.x);
-  reader.get("y", bbox.p1.y);
-  reader.get("type", type);
-  reader.get("use_path", use_path);
-  sprite = sprite_manager->create("platform");
-  sprite->set_action(type);
-  bbox.set_size(sprite->get_width(), sprite->get_height());
+  const lisp::Lisp* pathLisp = reader.get_lisp("path");
+  if(pathLisp == NULL)
+    throw std::runtime_error("No path specified for platform");
+  path.reset(new Path());
+  path->read(*pathLisp);
+  walker.reset(new PathWalker(path.get()));
 
+  bbox.p1 = path->get_base();
+  bbox.set_size(sprite->get_width(), sprite->get_height());
+  
+  set_group(COLGROUP_STATIC);
   flags |= FLAG_SOLID;
-
-  path = Path::GetByName(use_path);
-  if (path == NULL) { 
-     std::cerr << "Warning: Path for moving platform not found! Make sure that the name is spelled correctly,\nand that the path is initialized before the platform in the level file!\n";
-  }
-
-  path_offset = bbox.p1 - path->GetStart();
 }
 
 Platform::~Platform()
 {
-  delete sprite;
 }
 
 //TODO: Squish Tux when standing between platform and solid tile/object
@@ -63,15 +65,15 @@ HitResponse
 Platform::collision(GameObject& other, const CollisionHit& hit)
 {
   if (typeid(other) == typeid(Player)) {
-    Player* player = (Player*) &other;
-    if ((hit.normal.x == 0) && (hit.normal.y == 1)) {
+    if (hit.normal.y >= 0.9) {
       //Tux is standing on the platform
-      player->movement += path->GetLastMovement();
+      //Player* player = (Player*) &other;
+      //player->add_velocity(speed * 1.5);
+      return PASS_MOVEMENT;
     }
   }
   if(other.get_flags() & FLAG_SOLID) {
     //Collision with a solid tile
-    //does nothing, because the movement vector isn't used at the moment
     return ABORT_MOVE;
   }
   return FORCE_MOVE;
@@ -80,7 +82,8 @@ Platform::collision(GameObject& other, const CollisionHit& hit)
 void
 Platform::update(float elapsed_time)
 {
-  set_pos(path->GetPosition() + path_offset);
+  movement = walker->advance(elapsed_time);
+  speed = movement / elapsed_time;
 }
 
 void