Updating cherrybomb, adding juicebox (blue bomb).

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

diff --git a/src/badguy/igel.cpp b/src/badguy/igel.cpp
index 8800965..f7d5e1d 100644 (file)
--- a/src/badguy/igel.cpp
+++ b/src/badguy/igel.cpp
@@ -1,4 +1,4 @@
-//  $Id: igel.cpp 3478 2006-04-30 23:14:15Z sommer $
+//  $Id$
 //
 //  SuperTux - Badguy "Igel"
 //  Copyright (C) 2006 Christoph Sommer <christoph.sommer@2006.expires.deltadevelopment.de>
@@ -31,24 +31,13 @@ namespace {
 }
 
 Igel::Igel(const lisp::Lisp& reader)
-  : state(STATE_NORMAL)
+  : BadGuy(reader, "images/creatures/igel/igel.sprite"), state(STATE_NORMAL)
 {
-  reader.get("x", start_position.x);
-  reader.get("y", start_position.y);
-  sprite = sprite_manager->create("images/creatures/igel/igel.sprite");
-  bbox.set_size(sprite->get_current_hitbox_width(), sprite->get_current_hitbox_height());
-  set_direction = false;
 }
 
-Igel::Igel(float pos_x, float pos_y, Direction d)
-  : state(STATE_NORMAL)
+Igel::Igel(const Vector& pos, Direction d)
+  : BadGuy(pos, d, "images/creatures/igel/igel.sprite"), state(STATE_NORMAL)
 {
-  start_position.x = pos_x;
-  start_position.y = pos_y;
-  sprite = sprite_manager->create("images/creatures/igel/igel.sprite");
-  bbox.set_size(sprite->get_current_hitbox_width(), sprite->get_current_hitbox_height());
-  set_direction = true;
-  initial_direction = d;
 }
 
 void
@@ -65,8 +54,6 @@ Igel::write(lisp::Writer& writer)
 void
 Igel::activate()
 {
-  if (set_direction) {dir = initial_direction;}
-
   be_normal();
 }