Removed snowsnail, added snail

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

diff --git a/src/badguy/snowball.cpp b/src/badguy/snowball.cpp
index 1db1eb5..1c2e6b6 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,15 +12,14 @@
 //  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 "snowball.h"
+#include "snowball.hpp"
 
 static const float WALKSPEED = 80;
 
@@ -28,8 +27,12 @@ SnowBall::SnowBall(const lisp::Lisp& reader)
 {
   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);
-  sprite = sprite_manager->create("snowball");
+  if (fluffy) sprite = sprite_manager->create("images/creatures/fluffy/fluffy.sprite");
+  else sprite = sprite_manager->create("images/creatures/snowball/snowball.sprite");
   set_direction = false;
 }
 
@@ -38,7 +41,7 @@ SnowBall::SnowBall(float pos_x, float pos_y, Direction d)
   start_position.x = pos_x;
   start_position.y = pos_y;
   bbox.set_size(31.8, 31.8);
-  sprite = sprite_manager->create("snowball");
+  sprite = sprite_manager->create("images/creatures/snowball/snowball.sprite");
   set_direction = true;
   initial_direction = d;
 }
@@ -51,6 +54,10 @@ SnowBall::write(lisp::Writer& writer)
   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");
 }