Shrunk cherry bomb a little, fixed bounding boxes. /

[supertux.git] / src / badguy / snail.cpp

diff --git a/src/badguy/snail.cpp b/src/badguy/snail.cpp
index 72a7891..d53e914 100644 (file)
--- a/src/badguy/snail.cpp
+++ b/src/badguy/snail.cpp
@@ -1,4 +1,4 @@
-//  $Id: snail.cpp 3364 2006-04-19 00:54:40Z sommer $
+//  $Id$
 //
 //  SuperTux - Badguy "Snail"
 //  Copyright (C) 2006 Christoph Sommer <christoph.sommer@2006.expires.deltadevelopment.de>
@@ -26,28 +26,31 @@ namespace {
   const float WALKSPEED = 80;
   const float KICKSPEED = 500;
   const int MAXSQUISHES = 10;
-  const float KICKSPEED_Y = 500; /**< y-velocity gained when kicked */
+  const float KICKSPEED_Y = -500; /**< y-velocity gained when kicked */
 }
 
 Snail::Snail(const lisp::Lisp& reader)
-  : state(STATE_NORMAL), squishcount(0)
+  : BadGuy(reader, "images/creatures/snail/snail.sprite"), state(STATE_NORMAL), squishcount(0)
 {
-  reader.get("x", start_position.x);
-  reader.get("y", start_position.y);
-  bbox.set_size(31.8, 31.8);
-  sprite = sprite_manager->create("images/creatures/snail/snail.sprite");
+  reader.get("direction", direction);
   set_direction = false;
+  if( direction != "auto" && direction != ""){
+    set_direction = true;
+    initial_direction = str2dir( direction );
+  }
+  sound_manager->preload("sounds/iceblock_bump.wav");
+  sound_manager->preload("sounds/stomp.wav");
+  sound_manager->preload("sounds/kick.wav");
 }
 
-Snail::Snail(float pos_x, float pos_y, Direction d)
-  : state(STATE_NORMAL), squishcount(0)
+Snail::Snail(const Vector& pos, Direction d)
+  : BadGuy(pos, "images/creatures/snail/snail.sprite"), state(STATE_NORMAL), squishcount(0)
 {
-  start_position.x = pos_x;
-  start_position.y = pos_y;
-  bbox.set_size(31.8, 31.8);
-  sprite = sprite_manager->create("images/creatures/snail/snail.sprite");
   set_direction = true;
   initial_direction = d;
+  sound_manager->preload("sounds/iceblock_bump.wav");
+  sound_manager->preload("sounds/stomp.wav");
+  sound_manager->preload("sounds/kick.wav");
 }
 
 void
@@ -55,6 +58,7 @@ Snail::write(lisp::Writer& writer)
 {
   writer.start_list("snail");
 
+  writer.write_string("direction", direction);
   writer.write_float("x", start_position.x);
   writer.write_float("y", start_position.y);