- memleak fix and menu fix from MatzeB

[supertux.git] / src / special.h

diff --git a/src/special.h b/src/special.h
index 7ba652d..1cdbc4c 100644 (file)
--- a/src/special.h
+++ b/src/special.h
@@ -17,9 +17,6 @@
 //  along with this program; if not, write to the Free Software
 //  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
-#define BULLET_STARTING_YM 1
-#define BULLET_XM 5
-
 #ifndef SUPERTUX_SPECIAL_H
 #define SUPERTUX_SPECIAL_H
 
@@ -47,12 +44,12 @@ class Upgrade
 {
 public:
   UpgradeKind kind;
-  int dir;
+  Direction  dir;
   base_type base;
   base_type old_base;
   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);
@@ -71,7 +68,7 @@ class Bullet
   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);