X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=src%2Fbadguy%2Fbadguy.h;h=ef17b751c28c1a230e613cfe5266dea64dd88368;hb=2b18d7e2549f4be99533fed58c0f07887a19db37;hp=e770feb6148824d68ac8adc2b57b015cd1628899;hpb=908a780ca974cc9d8bf6c2815d9eec6e8ec25fbb;p=supertux.git

diff --git a/src/badguy/badguy.h b/src/badguy/badguy.h
index e770feb61..ef17b751c 100644
--- a/src/badguy/badguy.h
+++ b/src/badguy/badguy.h
@@ -1,12 +1,31 @@
+//  $Id$
+// 
+//  SuperTux
+//  Copyright (C) 2005 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 distributed in the hope that it will be useful,
+//  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.
 #ifndef __BADGUY_H__
 #define __BADGUY_H__
 
 // moved them here to make it less typing when implementing new badguys
 #include <math.h>
 #include "timer.h"
-#include "special/moving_object.h"
-#include "special/sprite.h"
-#include "math/physic.h"
+#include "moving_object.h"
+#include "sprite/sprite.h"
+#include "physic.h"
 #include "object/player.h"
 #include "serializable.h"
 #include "resources.h"
@@ -17,9 +36,7 @@
 #include "lisp/lisp.h"
 #include "lisp/writer.h"
 #include "video/drawing_context.h"
-#include "special/sprite_manager.h"
-
-using namespace SuperTux;
+#include "sprite/sprite_manager.h"
 
 class BadGuy : public MovingObject, public Serializable
 {
@@ -127,7 +144,7 @@ private:
   void try_activate();
   
   State state;
-  Timer2 state_timer;
+  Timer state_timer;
 };
 
 #endif