huge CVS merge, see ChangeLog for details.

[supertux.git] / src / special.h

diff --git a/src/special.h b/src/special.h
index 1a72906..7190428 100644 (file)
--- a/src/special.h
+++ b/src/special.h
@@ -21,6 +21,7 @@
 #include "type.h"
 #include "texture.h"
 #include "collision.h"
+#include "player.h"
 
 typedef struct upgrade_type
   {
@@ -35,19 +36,19 @@ typedef struct bullet_type
   }
 bullet_type;
 
-texture_type img_bullet;
-bitmask* bm_bullet;
+extern texture_type img_bullet;
+extern bitmask* bm_bullet;
 
 void create_special_bitmasks();
 
-texture_type img_golden_herring;
+extern texture_type img_golden_herring;
 
-void upgrade_init(upgrade_type *pupgrade);
+void upgrade_init(upgrade_type *pupgrade, float x, float y, int kind);
 void upgrade_action(upgrade_type *pupgrade);
 void upgrade_draw(upgrade_type *pupgrade);
 void upgrade_collision(upgrade_type *pupgrade, void* p_c_object, int c_object);
 
-void bullet_init(bullet_type *pbullet);
+void bullet_init(bullet_type* pbullet, float x, float y, float xm, int dir);
 void bullet_action(bullet_type *pbullet);
 void bullet_draw(bullet_type *pbullet);
 void bullet_collision(bullet_type *pbullet, int c_object);