- fixed problem with last_menu not being able to handle menues deeper than two submenues

[supertux.git] / src / scene.cpp

diff --git a/src/scene.cpp b/src/scene.cpp
index c9c506a..681500f 100644 (file)
--- a/src/scene.cpp
+++ b/src/scene.cpp
@@ -13,45 +13,19 @@
 #include <stdlib.h>
 #include "scene.h"
 
-int score;
-int distros;
-int level;
-int next_level;
-int game_pause;
-int score_multiplier;
-int endpos;
-bool counting_distros;
-int distro_counter;
-timer_type  super_bkgd_timer;
-float scroll_x;
-unsigned int global_frame_counter;
-
-Player tux;
-texture_type img_box_full;
-texture_type img_box_empty;
-texture_type img_mints;
-texture_type img_coffee;
-texture_type img_super_bkgd;
-texture_type img_red_glow;
-timer_type time_left;
-double frame_ratio;
+PlayerStatus player_status;
 
-void set_defaults(void)
+PlayerStatus::PlayerStatus()
+  : score(0),
+    distros(0),
+    lives(3)
 {
-  // Set defaults: 
-  scroll_x = 0;
-
-  score_multiplier = 1;
-  timer_init(&super_bkgd_timer, true);
-
-  counting_distros = false;
-  distro_counter = 0;
+}
 
-  endpos = 0;
+// FIXME: Move this into a view class
+float scroll_x;
 
-  /* set current song/music */
-  set_current_music(LEVEL_MUSIC);
-}
+unsigned int global_frame_counter;
 
 // EOF //