New GameObject SpriteParticle

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

diff --git a/src/object/rock.cpp b/src/object/rock.cpp
index 2b17713..2df1586 100644 (file)
--- 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,11 +12,11 @@
 //  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"
@@ -57,7 +57,7 @@ Rock::write(lisp::Writer& writer)
 void
 Rock::draw(DrawingContext& context)
 {
-  sprite->draw(context, get_pos(), LAYER_OBJECTS);
+  sprite->draw(context, get_pos(), LAYER_OBJECTS+1);
 }
 
 void
@@ -74,21 +74,21 @@ Rock::update(float elapsed_time)
   }
   
   grabbed = false;
+  /*
   printf("%p - V %3.1f %3.1f - P %3.1f %3.1f\n", this,
           physic.get_velocity().x, physic.get_velocity().y,
           get_pos().x, get_pos().y);
+  */
 }
 
 HitResponse
-Rock::collision(GameObject& object, const CollisionHit& hit)
+Rock::collision(GameObject& object, const CollisionHit& )
 {
   if(grabbed) {
     return FORCE_MOVE;
   }
 
   if(object.get_flags() & FLAG_SOLID) {
-    printf("%p vs %p - %3.1f %3.1f D %3.1f\n", this, &object,
-        hit.normal.x, hit.normal.y, hit.depth);
     physic.set_velocity(0, 0);
     return CONTINUE;
   }