Renamed namespaces to all lowercase

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

diff --git a/src/badguy/willowisp.hpp b/src/badguy/willowisp.hpp
index ced7230..19e4bb1 100644 (file)
--- a/src/badguy/willowisp.hpp
+++ b/src/badguy/willowisp.hpp
@@ -1,56 +1,88 @@
-//  $Id$
-// 
 //  SuperTux - "Will-O-Wisp" Badguy
 //  Copyright (C) 2006 Christoph Sommer <christoph.sommer@2006.expires.deltadevelopment.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
 //  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.
+//  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+#ifndef HEADER_SUPERTUX_BADGUY_WILLOWISP_HPP
+#define HEADER_SUPERTUX_BADGUY_WILLOWISP_HPP
+
+#include "badguy/badguy.hpp"
 
-#ifndef __WILLOWISP_H__
-#define __WILLOWISP_H__
+class Path;
+class PathWalker;
+class SoundSource;
 
-#include "badguy.hpp"
+#include "scripting/willowisp.hpp"
+#include "supertux/script_interface.hpp"
 
-class WillOWisp : public BadGuy
+class WillOWisp : public BadGuy, 
+                  public scripting::WillOWisp,
+                  public ScriptInterface
 {
 public:
-  WillOWisp(const lisp::Lisp& reader);
+  WillOWisp(const Reader& reader);
 
   void activate();
   void deactivate();
 
-  void write(lisp::Writer& write);
   void active_update(float elapsed_time);
-  void kill_fall();
+  virtual bool is_flammable() const { return false; }
+  virtual bool is_freezable() const { return false; }
+  virtual void kill_fall() { vanish(); }
+
+  /**
+   * make WillOWisp vanish
+   */
+  void vanish();
 
   virtual void draw(DrawingContext& context);
 
+  virtual void goto_node(int node_no);
+  virtual void set_state(const std::string& state);
+  virtual void start_moving();
+  virtual void stop_moving();
+
+  virtual void expose(HSQUIRRELVM vm, SQInteger table_idx);
+  virtual void unexpose(HSQUIRRELVM vm, SQInteger table_idx);
+
 protected:
+  virtual bool collides(GameObject& other, const CollisionHit& hit);
   HitResponse collision_player(Player& player, const CollisionHit& hit);
 
 private:
   enum MyState {
-    STATE_IDLE, STATE_TRACKING, STATE_VANISHING, STATE_WARPING
+    STATE_STOPPED, STATE_IDLE, STATE_TRACKING, STATE_VANISHING, STATE_WARPING,
+    STATE_PATHMOVING, STATE_PATHMOVING_TRACK
   };
+
+private:
   MyState mystate;
 
   std::string target_sector;
   std::string target_spawnpoint;
+  std::string hit_script;
 
   std::auto_ptr<SoundSource> sound_source;
+
+  std::auto_ptr<Path>        path;
+  std::auto_ptr<PathWalker>  walker;
+
+  float flyspeed;
+  float track_range;
+  float vanish_range;
 };
 
 #endif
 
+/* EOF */