X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=src%2Fbadguy%2Fnolok_01.h;h=320da70e8dfc6d190e32ce366146ac2feafe6026;hb=22901c90fe1a4b0d5a6ef8fccb2494699b888e32;hp=cc50d5a76646d2632ab48fcb9ba4c3d1c04aaccb;hpb=ef57479f613b900b73eba8e8f4d026aae0de25cc;p=supertux.git

diff --git a/src/badguy/nolok_01.h b/src/badguy/nolok_01.h
index cc50d5a76..320da70e8 100644
--- a/src/badguy/nolok_01.h
+++ b/src/badguy/nolok_01.h
@@ -1,3 +1,23 @@
+//  $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 __NOLOK01_H__
 #define __NOLOK01_H__
 
@@ -13,11 +33,12 @@ public:
   void activate();
   void write(lisp::Writer& writer);
   void active_action(float elapsed_time);
+  void kill_fall();
   HitResponse collision_solid(GameObject& other, const CollisionHit& hit);
   
 protected:
   bool collision_squished(Player& player);
-  Timer2 action_timer;
+  Timer action_timer;
   enum Actions { WALKING, JUMPING, SHOOTING };
   Actions action;
 };