X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=src%2Fbadguy%2Fbadguy.h;h=d5c948cd7952ce743747658c14d2f42ea2651a33;hb=8d1566374788e2c612b35d6b95463398a555b54a;hp=bb31e718d90a0f97e81350473b1a576c320ceaba;hpb=abf179b33deb4040bb583e29207eaf1dd2ee0780;p=supertux.git

diff --git a/src/badguy/badguy.h b/src/badguy/badguy.h
index bb31e718d..d5c948cd7 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
 {
@@ -90,7 +107,7 @@ protected:
    * variable might have been changed so that it faces towards the player.
    */
   virtual void activate();
-  /** caleed when the badguy has been deactivated */
+  /** called when the badguy has been deactivated */
   virtual void deactivate();
 
   void kill_squished(Player& player);
@@ -122,6 +139,7 @@ protected:
   Direction dir;
 
   int hitpoints;
+  int bullet_hitpoints;
 private:
   void try_activate();