- more menu cleanup

[supertux.git] / src / scene.h

diff --git a/src/scene.h b/src/scene.h
index 923156f..9aa0529 100644 (file)
--- a/src/scene.h
+++ b/src/scene.h
@@ -26,20 +26,13 @@ extern int score, distros, level, next_level, game_pause, quit, score_multiplier
 extern timer_type  super_bkgd_timer;
 extern float scroll_x;
 extern int frame;
-extern bouncy_distro_type *bouncy_distros;
-extern broken_brick_type *broken_bricks;
-extern bouncy_brick_type *bouncy_bricks;
-extern bad_guy_type *bad_guys;
-extern floating_score_type *floating_scores;
-extern upgrade_type *upgrades;
-extern bullet_type *bullets;
-extern int num_bad_guys;
-extern int num_bouncy_distros;
-extern int num_broken_bricks;
-extern int num_bouncy_bricks;
-extern int num_floating_scores;
-extern int num_upgrades;
-extern int num_bullets;
+extern std::vector<bouncy_distro_type> bouncy_distros;
+extern std::vector<broken_brick_type> broken_bricks;
+extern std::vector<bouncy_brick_type> bouncy_bricks;
+extern std::vector<bad_guy_type> bad_guys;
+extern std::vector<floating_score_type> floating_scores;
+extern std::vector<upgrade_type> upgrades;
+extern std::vector<bullet_type> bullets;
 extern player_type tux;
 extern texture_type img_box_full, img_box_empty, img_mints, img_coffee, img_super_bkgd, img_red_glow;
 extern timer_type time_left;
@@ -55,7 +48,7 @@ void add_broken_brick(float x, float y);
 void add_broken_brick_piece(float x, float y, float xm, float ym);
 void add_bouncy_brick(float x, float y);
 void add_bad_guy(float x, float y, int kind);
-void add_upgrade(float x, float y, int kind);
+void add_upgrade(float x, float y, int dir, int kind);
 void add_bullet(float x, float y, float xm, int dir);
 
 #endif /*SUPERTUX_SCENE_H*/