X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=src%2Fbadguy%2Fdispenser.hpp;h=106607806b791f3f5c3bf793de5477215447bb9f;hb=198f758764fff064a47630b5d0f1e3d6aabe95a8;hp=2b4f10fc0cb16dc4353e85dc0d166c4b172d28dc;hpb=5b7f9214cb929399f1a855ef5807018a9447d510;p=supertux.git

diff --git a/src/badguy/dispenser.hpp b/src/badguy/dispenser.hpp
index 2b4f10fc0..106607806 100644
--- a/src/badguy/dispenser.hpp
+++ b/src/badguy/dispenser.hpp
@@ -1,7 +1,7 @@
 //  $Id$
-// 
+//
 //  SuperTux
-//  Copyright (C) 2005 Matthias Braun <matze@braunis.de>
+//  Copyright (C) 2006 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
@@ -12,11 +12,10 @@
 //  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.
+//  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 #ifndef __DISPENSER_H__
 #define __DISPENSER_H__
@@ -30,16 +29,29 @@ public:
   Dispenser(const lisp::Lisp& reader);
 
   void activate();
+  void deactivate();
   void write(lisp::Writer& writer);
   void active_update(float elapsed_time);
 
+  void freeze();
+  void unfreeze();
+  bool is_freezable() const;
+
+  virtual Dispenser* clone() const { return new Dispenser(*this); }
+
 protected:
-  bool collision_squished(Player& player);
+  bool collision_squished(GameObject& object);
+  HitResponse collision(GameObject& other, const CollisionHit& hit);
   void launch_badguy();
   float cycle;
-  std::string badguy;
+  std::vector<std::string> badguys;
+  unsigned int next_badguy;
   Timer dispense_timer;
+  bool autotarget;
+  bool swivel;
+  bool broken;
+  bool random;
+  std::string type;
 };
 
 #endif
-