X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=src%2Fbadguy%2Fdispenser.h;h=31a57d98aa80f0ef0a1111d0448176ea319a6af2;hb=22901c90fe1a4b0d5a6ef8fccb2494699b888e32;hp=3dd24899ee968e1dd0aea195dc4b7a84750cf01e;hpb=ef57479f613b900b73eba8e8f4d026aae0de25cc;p=supertux.git

diff --git a/src/badguy/dispenser.h b/src/badguy/dispenser.h
index 3dd24899e..31a57d98a 100644
--- a/src/badguy/dispenser.h
+++ b/src/badguy/dispenser.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 __DISPENSER_H__
 #define __DISPENSER_H__
 
@@ -11,7 +31,6 @@ public:
 
   void activate();
   void write(lisp::Writer& writer);
-  HitResponse collision_solid(GameObject& other, const CollisionHit& hit);
   void active_action(float elapsed_time);
 
 protected:
@@ -19,7 +38,7 @@ protected:
   void launch_badguy();
   float cycle;
   std::string badguy;
-  Timer2 dispense_timer;
+  Timer dispense_timer;
 };
 
 #endif