Adding Objects works through clicking instead pressing now.

[supertux.git] / src / special.h

diff --git a/src/special.h b/src/special.h
index 1a3364b..24ce8c2 100644 (file)
--- a/src/special.h
+++ b/src/special.h
@@ -1,17 +1,21 @@
+//  $Id$
 //
-// C Interface: special
+//  SuperTux -  A Jump'n Run
+//  Copyright (C) 2003 Tobias Glaesser <tobi.web@gmx.de>
 //
-// Description: 
+//  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.
 //
-// Author: Tobias Glaesser <tobi.web@gmx.de>, (C) 2004
-//
-// Copyright: See COPYING file that comes with this distribution
-//
-//
-
-#define BULLET_STARTING_YM 1
-#define BULLET_XM 5
+//  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 SUPERTUX_SPECIAL_H
 #define SUPERTUX_SPECIAL_H
@@ -36,19 +40,20 @@ enum UpgradeKind {
 void load_special_gfx();
 void free_special_gfx();
 
-class Upgrade
+class Upgrade : public GameObject
 {
 public:
   UpgradeKind kind;
-  int dir;
-  base_type base;
-  base_type old_base;
+  Direction  dir;
   Physic physic;
 
-  void init(float x, float y, int dir, UpgradeKind kind);
+  void init(float x, float y, Direction dir, UpgradeKind kind);
   void action(double frame_ratio);
   void draw();
-  void collision(void* p_c_object, int c_object);
+  void collision(void* p_c_object, int c_object, CollisionType type);
+  std::string type() { return "Upgrade"; };
+  
+  ~Upgrade() {};
 
 private:
   /** removes the Upgrade from the global upgrade list. Note that after this
@@ -56,18 +61,22 @@ private:
    * anymore then
    */
   void remove_me();
+
+  void bump(Player* player);
 };
 
-class Bullet
+class Bullet : public GameObject
 {
  public:
+  int life_count;
   base_type base;
   base_type old_base;
   
-  void init(float x, float y, float xm, int dir);
+  void init(float x, float y, float xm, Direction dir);
   void action(double frame_ratio);
   void draw();
   void collision(int c_object);
+  std::string type() { return "Bullet"; };
 
 private:
   /** removes the Upgrade from the global upgrade list. Note that after this