Removed snowsnail, added snail

[supertux.git] / src / badguy / mrtree.hpp

diff --git a/src/badguy/mrtree.hpp b/src/badguy/mrtree.hpp
index 8858d4e..db3d019 100644 (file)
--- a/src/badguy/mrtree.hpp
+++ b/src/badguy/mrtree.hpp
@@ -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,33 +12,35 @@
 //  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.
 
-#ifndef __TOTEM_H__
-#define __TOTEM_H__
+#ifndef __MRTREE_H__
+#define __MRTREE_H__
 
 #include "badguy.hpp"
 
-class Totem : public BadGuy
+class MrTree : public BadGuy
 {
 public:
-  Totem(const lisp::Lisp& reader);
+  MrTree(const lisp::Lisp& reader);
 
   void activate();
+  void active_update(float elapsed_time);
   void write(lisp::Writer& writer);
   HitResponse collision_solid(GameObject& other, const CollisionHit& hit);
   HitResponse collision_badguy(BadGuy& badguy, const CollisionHit& hit);
 
 protected:
   enum MyState {
-    STATE_BIG, STATE_NORMAL
+    STATE_BIG, STATE_INVINCIBLE, STATE_NORMAL
   };
   MyState mystate;
-  
+
+  Timer invincible_timer;
+
   bool collision_squished(Player& player);
 };