X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Fbadguy%2Fghosttree.hpp;h=d71cad8916d50bbfb28a944680ad53ea8dfcf31c;hb=35f17b8b7e5e0bafca3a34550fa300db704aedaa;hp=c17792bb29ff0de193521a8ae8644406f92cd1cd;hpb=e4eade21a778b7042eccfac371f33fb257ec7105;p=supertux.git

diff --git a/src/badguy/ghosttree.hpp b/src/badguy/ghosttree.hpp
index c17792bb2..d71cad891 100644
--- a/src/badguy/ghosttree.hpp
+++ b/src/badguy/ghosttree.hpp
@@ -1,12 +1,10 @@
-//  $Id$
-//
 //  SuperTux - Boss "GhostTree"
 //  Copyright (C) 2007 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
-//  as published by the Free Software Foundation; either version 2
-//  of the License, or (at your option) any later version.
+//  This program is free software: you can redistribute it and/or modify
+//  it under the terms of the GNU General Public License as published by
+//  the Free Software Foundation, either version 3 of the License, or
+//  (at your option) any later version.
 //
 //  This program is distributed in the hope that it will be useful,
 //  but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -14,44 +12,66 @@
 //  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.
-#ifndef __GHOSTTREE_H__
-#define __GHOSTTREE_H__
+//  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+#ifndef HEADER_SUPERTUX_BADGUY_GHOSTTREE_HPP
+#define HEADER_SUPERTUX_BADGUY_GHOSTTREE_HPP
 
-#include <vector>
-#include "badguy.hpp"
+#include "badguy/badguy.hpp"
 
 class TreeWillOWisp;
+class Lantern;
 
 class GhostTree : public BadGuy
 {
 public:
-  GhostTree(const lisp::Lisp& lisp);
+  GhostTree(const Reader& lisp);
   ~GhostTree();
 
+  virtual bool is_flammable() const { return false; }
+  virtual bool is_freezable() const { return false; }
+  virtual void kill_fall() { }
+
   void activate();
   void active_update(float elapsed_time);
   void willowisp_died(TreeWillOWisp* willowisp);
   virtual void draw(DrawingContext& context);
 
+  virtual bool collides(GameObject& other, const CollisionHit& hit);
+  virtual HitResponse collision(GameObject& other, const CollisionHit& hit);
+
   void die();
 
 private:
+  enum MyState {
+    STATE_IDLE, STATE_SUCKING, STATE_SWALLOWING, STATE_DYING
+  };
+  MyState mystate;
   Timer willowisp_timer;
   float willo_spawn_y;
   float willo_radius;
   float willo_speed;
   int   willo_color;
 
-  std::auto_ptr<Sprite> glow_sprite;
+  SpritePtr glow_sprite;
   Timer colorchange_timer;
   Timer suck_timer;
   Timer root_timer;
   int   treecolor;
+  Color suck_lantern_color;
+
+  Lantern* suck_lantern; /**< Lantern that is currently being sucked in */
 
   std::vector<TreeWillOWisp*> willowisps;
+
+  bool is_color_deadly(Color color) const;
+  void spawn_lantern();
+
+private:
+  GhostTree(const GhostTree&);
+  GhostTree& operator=(const GhostTree&);
 };
 
 #endif
 
+/* EOF */