- commited MatzeB's update patch

[supertux.git] / src / special.h

diff --git a/src/special.h b/src/special.h
index c246bd8..dfec8a4 100644 (file)
--- a/src/special.h
+++ b/src/special.h
@@ -22,26 +22,40 @@
 #include "texture.h"
 #include "collision.h"
 #include "player.h"
+#include "physic.h"
 
 /* Upgrade types: */
 
 enum {
-  UPGRADE_MINTS,
-  UPGRADE_COFFEE,
-  UPGRADE_HERRING
+  UPGRADE_GROWUP,
+  UPGRADE_ICEFLOWER,
+  UPGRADE_HERRING,
+  UPGRADE_1UP
 };
 
+void load_special_gfx();
+void free_special_gfx();
+
 class Upgrade
 {
- public:
+public:
   int kind;
+  int dir;
   base_type base;
   base_type old_base;
+  Physic physic;
 
   void init(float x, float y, int dir, int kind);
-  void action();
+  void action(double frame_ratio);
   void draw();
   void collision(void* p_c_object, int c_object);
+
+private:
+  /** removes the Upgrade from the global upgrade list. Note that after this
+   * call the class doesn't exist anymore! So don't use any member variables
+   * anymore then
+   */
+  void remove_me();
 };
 
 class Bullet
@@ -51,16 +65,16 @@ class Bullet
   base_type old_base;
   
   void init(float x, float y, float xm, int dir);
-  void action();
+  void action(double frame_ratio);
   void draw();
   void collision(int c_object);
-};
 
-extern texture_type img_bullet;
-extern bitmask* bm_bullet;
-
-void create_special_bitmasks();
-
-extern texture_type img_golden_herring;
+private:
+  /** removes the Upgrade from the global upgrade list. Note that after this
+   * call the class doesn't exist anymore! So don't use any member variables
+   * anymore then
+   */
+  void remove_me();
+};
 
 #endif /*SUPERTUX_SPECIAL_H*/