- moved some more level_ stuff into the levelclass

[supertux.git] / src / scene.h

diff --git a/src/scene.h b/src/scene.h
index dc3e1fa..6d0203a 100644 (file)
--- a/src/scene.h
+++ b/src/scene.h
@@ -20,14 +20,15 @@
 #include "world.h"
 #include "special.h"
 #include "level.h"
+#include "particlesystem.h"
 
 #define FRAME_RATE 10 // 100 Frames per second (10ms)
+
 extern int score;
 extern int distros;
 extern int level; 
 extern int next_level;
 extern int game_pause;
-extern bool quit;
 extern int score_multiplier;
 extern int endpos;
 extern bool counting_distros;
@@ -35,30 +36,13 @@ extern int distro_counter;
 
 extern timer_type  super_bkgd_timer;
 extern float scroll_x;
-extern int frame;
-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<BadGuy> 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 unsigned int global_frame_counter;
+
+extern Player 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;
 extern double frame_ratio;
 
-void add_score(float x, float y, int s);
 void set_defaults(void);
-void arrays_init(void);
-void arrays_free(void);
-
-void add_bouncy_distro(float x, float y);
-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, BadGuyKind 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*/