- Implemented a scripted object that can be placed in a level and whose name is

[supertux.git] / src / badguy / nolok_01.h

diff --git a/src/badguy/nolok_01.h b/src/badguy/nolok_01.h
index ff32034..320da70 100644 (file)
--- 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__
 
@@ -7,19 +27,20 @@
 class Nolok_01 : public BadGuy
 {
 public:
-  Nolok_01(LispReader& reader);
+  Nolok_01(const lisp::Lisp& reader);
   Nolok_01(float pos_x, float pos_y);
 
   void activate();
-  void write(LispWriter& writer);
+  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;
-  enum { IDLE, WALKING, JUMPING, SHOOTING };
-  int action;
+  Timer action_timer;
+  enum Actions { WALKING, JUMPING, SHOOTING };
+  Actions action;
 };
 
 #endif