X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Fbadguy%2Froot.hpp;h=35df91ab6661dee9375ea0f77802b950b42327e0;hb=d4356e834ab3a802392b4451e2c3097124dc4dde;hp=d693f232dc05d070e576269d8f7f405d46f9fc90;hpb=aec9bf199857d0ae1a5dc54cd96ae37177493deb;p=supertux.git

diff --git a/src/badguy/root.hpp b/src/badguy/root.hpp
index d693f232d..35df91ab6 100644
--- a/src/badguy/root.hpp
+++ b/src/badguy/root.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,13 +12,12 @@
 //  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 __ROOT_H__
-#define __ROOT_H__
+//  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+#ifndef HEADER_SUPERTUX_BADGUY_ROOT_HPP
+#define HEADER_SUPERTUX_BADGUY_ROOT_HPP
 
-#include <memory>
-#include "badguy.hpp"
+#include "badguy/badguy.hpp"
 
 class Timer;
 
@@ -30,7 +27,6 @@ public:
   Root(const Vector& pos);
   ~Root();
 
-  void activate();
   void deactivate();
   void active_update(float elapsed_time);
   virtual void draw(DrawingContext& context);
@@ -42,10 +38,14 @@ protected:
   enum MyState {
     STATE_APPEARING, STATE_HATCHING, STATE_GROWING, STATE_SHRINKING, STATE_VANISHING
   };
+
+private:
   MyState mystate;
-  std::auto_ptr<Sprite> base_sprite;
+  SpritePtr base_sprite;
   float offset_y;
   Timer hatch_timer;
 };
 
 #endif
+
+/* EOF */