X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=src%2Fobject%2Frock.cpp;h=f4355788d3fe27d5714aaf4bd7c3df307814769c;hb=3e86b3d0c8c9ed1137e8716fcecbcd0ca67bea7b;hp=e6862f3155918b2748cb9465e60a379222e67510;hpb=d62647592b4ccffa89794af6fa03faaced46999d;p=supertux.git

diff --git a/src/object/rock.cpp b/src/object/rock.cpp
index e6862f315..f4355788d 100644
--- a/src/object/rock.cpp
+++ b/src/object/rock.cpp
@@ -1,7 +1,7 @@
 //  $Id$
-// 
+//
 //  SuperTux
-//  Copyright (C) 2005 Matthias Braun <matze@braunis.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,34 +12,39 @@
 //  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 "rock.hpp"
-#include "sprite/sprite.hpp"
-#include "sprite/sprite_manager.hpp"
 #include "lisp/writer.hpp"
-#include "video/drawing_context.hpp"
-#include "resources.hpp"
 #include "object_factory.hpp"
+#include "audio/sound_manager.hpp"
+#include "tile.hpp"
+
+namespace {
+  const std::string ROCK_SOUND = "sounds/brick.wav"; //TODO use own sound.
+}
 
 Rock::Rock(const lisp::Lisp& reader)
+  : MovingSprite(reader, "images/objects/rock/rock.sprite")
 {
-  reader.get("x", bbox.p1.x);
-  reader.get("y", bbox.p1.y);
-  bbox.set_size(31.8, 31.8);
-  sprite = sprite_manager->create("rock");
+  sound_manager->preload(ROCK_SOUND);
+  on_ground = false;
   grabbed = false;
-  flags |= FLAG_SOLID;
+  set_group(COLGROUP_MOVING_STATIC);
 }
 
-Rock::~Rock()
+Rock::Rock(const lisp::Lisp& reader, std::string spritename)
+  : MovingSprite(reader, spritename)
 {
-  delete sprite;
+  sound_manager->preload(ROCK_SOUND);
+  on_ground = false;
+  grabbed = false;
+  set_group(COLGROUP_MOVING_STATIC);
 }
 
 void
@@ -54,48 +59,72 @@ Rock::write(lisp::Writer& writer)
 }
 
 void
-Rock::draw(DrawingContext& context)
+Rock::update(float elapsed_time)
 {
+  if( grabbed )
+    return;
+
+  if (on_ground) physic.set_velocity_x(0);
 
-  sprite->draw(context, get_pos(), LAYER_OBJECTS);
+  movement = physic.get_movement(elapsed_time);
 }
 
 void
-Rock::update(float elapsed_time)
+Rock::collision_solid(const CollisionHit& hit)
 {
-  if(!grabbed) {
-    flags |= FLAG_SOLID;
-    set_group(COLGROUP_STATIC);
-    movement = physic.get_movement(elapsed_time);
-  } else {
+  if(hit.top || hit.bottom)
+    physic.set_velocity_y(0);
+  if(hit.left || hit.right)
+    physic.set_velocity_x(0);
+  if(hit.crush)
     physic.set_velocity(0, 0);
-    flags &= ~FLAG_SOLID;
-    set_group(COLGROUP_DISABLED);
+
+  if(hit.bottom  && !on_ground) {
+    sound_manager->play(ROCK_SOUND, get_pos());
+    on_ground = true;
   }
-  
-  grabbed = false;
 }
 
 HitResponse
-Rock::collision(GameObject& object, const CollisionHit& )
+Rock::collision(GameObject& other, const CollisionHit& hit)
 {
-  if(grabbed)
+  if(!on_ground) {
+    if(hit.bottom && physic.get_velocity_y() > 200) {
+      MovingObject* moving_object = dynamic_cast<MovingObject*> (&other);
+      if(moving_object) {
+        //Getting a rock on the head hurts. A lot.
+        moving_object->collision_tile(Tile::HURTS);
+      }
+    }
     return FORCE_MOVE;
-
-  if(object.get_flags() & FLAG_SOLID) {
-      physic.set_velocity(0, 0);
-      return CONTINUE;
   }
 
   return FORCE_MOVE;
 }
 
 void
-Rock::grab(MovingObject& , const Vector& pos)
+Rock::grab(MovingObject& , const Vector& pos, Direction)
 {
   movement = pos - get_pos();
+  last_movement = movement;
+  set_group(COLGROUP_DISABLED);
+  on_ground = true;
   grabbed = true;
 }
 
-IMPLEMENT_FACTORY(Rock, "rock");
+void
+Rock::ungrab(MovingObject& , Direction dir)
+{
+  set_group(COLGROUP_MOVING_STATIC);
+  on_ground = false;
+  if(dir == UP) {
+    physic.set_velocity(0, -500);
+  } else if (last_movement.norm() > 1) {
+    physic.set_velocity((dir == RIGHT) ? 200 : -200, -200);
+  } else {
+    physic.set_velocity(0, 0);
+  }
+  grabbed = false;
+}
 
+IMPLEMENT_FACTORY(Rock, "rock");