Fixed MrTree. He uses activate() to change direction which is now working again.

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

diff --git a/src/badguy/snowball.cpp b/src/badguy/snowball.cpp
index 65319d8..22dce8e 100644 (file)
--- a/src/badguy/snowball.cpp
+++ b/src/badguy/snowball.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,10 @@
 //  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>
 
@@ -25,24 +24,19 @@
 static const float WALKSPEED = 80;
 
 SnowBall::SnowBall(const lisp::Lisp& reader)
+       : BadGuy(reader, "images/creatures/snowball/snowball.sprite")
 {
-  reader.get("x", start_position.x);
-  reader.get("y", start_position.y);
-  //This is for a hidden badguy :)
-  fluffy = false;  
-  reader.get("fluffy",fluffy);
-  bbox.set_size(31.8, 31.8);
-  if (fluffy) sprite = sprite_manager->create("fluffy");
-  else sprite = sprite_manager->create("snowball");
   set_direction = false;
+  reader.get("direction", direction);
+  if( direction != "auto" && direction != ""){
+    set_direction = true;
+    initial_direction = str2dir( direction );
+  }
 }
 
-SnowBall::SnowBall(float pos_x, float pos_y, Direction d)
+SnowBall::SnowBall(const Vector& pos, Direction d)
+       : BadGuy(pos, "images/creatures/snowball/snowball.sprite")
 {
-  start_position.x = pos_x;
-  start_position.y = pos_y;
-  bbox.set_size(31.8, 31.8);
-  sprite = sprite_manager->create("snowball");
   set_direction = true;
   initial_direction = d;
 }
@@ -52,13 +46,14 @@ SnowBall::write(lisp::Writer& writer)
 {
   writer.start_list("snowball");
 
+  writer.write_string("direction", direction);
   writer.write_float("x", start_position.x);
   writer.write_float("y", start_position.y);
-
+  /*
   if (fluffy) {  // don't give us away at every snowball
     writer.write_bool("fluffy", true);
   }
-
+  */
   writer.end_list("snowball");
 }