Merged changes from branches/supertux-milestone2-grumbel/ to trunk/supertux/

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

diff --git a/src/badguy/root.hpp b/src/badguy/root.hpp
index b3a302c..2c05bbb 100644 (file)
--- 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;
 
@@ -41,6 +38,8 @@ protected:
   enum MyState {
     STATE_APPEARING, STATE_HATCHING, STATE_GROWING, STATE_SHRINKING, STATE_VANISHING
   };
+
+private:
   MyState mystate;
   std::auto_ptr<Sprite> base_sprite;
   float offset_y;
@@ -48,3 +47,5 @@ protected:
 };
 
 #endif
+
+/* EOF */