- moved some more level_ stuff into the levelclass

[supertux.git] / src / scene.h

diff --git a/src/scene.h b/src/scene.h
index 4304007..6d0203a 100644 (file)
--- a/src/scene.h
+++ b/src/scene.h
@@ -20,39 +20,29 @@
 #include "world.h"
 #include "special.h"
 #include "level.h"
+#include "particlesystem.h"
 
 #define FRAME_RATE 10 // 100 Frames per second (10ms)
-int score, distros, level, next_level, game_pause,
-done, quit, score_multiplier, endpos, counting_distros, distro_counter;
-timer_type  super_bkgd_timer;
-float scroll_x;
-int frame;
-bouncy_distro_type *bouncy_distros;
-broken_brick_type *broken_bricks;
-bouncy_brick_type *bouncy_bricks;
-bad_guy_type *bad_guys;
-floating_score_type *floating_scores;
-upgrade_type *upgrades;
-bullet_type *bullets;
-int num_bad_guys;
-int num_bouncy_distros;
-int num_broken_bricks;
-int num_bouncy_bricks;
-int num_floating_scores;
-int num_upgrades;
-int num_bullets;
-player_type tux;
-SDL_Rect src, dest;
-texture_type img_box_full, img_box_empty, img_mints, img_coffee, img_super_bkgd, img_red_glow;
-st_level current_level;
-unsigned int last_update_time;
-unsigned int update_time;
-timer_type time_left;
-double frame_ratio;
-
-void add_score(int x, int y, int s);
+
+extern int score;
+extern int distros;
+extern int level; 
+extern int next_level;
+extern int game_pause;
+extern int score_multiplier;
+extern int endpos;
+extern bool counting_distros;
+extern int distro_counter;
+
+extern timer_type  super_bkgd_timer;
+extern float scroll_x;
+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 set_defaults(void);
-void arrays_init(void);
-void arrays_free(void);
 
 #endif /*SUPERTUX_SCENE_H*/