updated dispenser -- can summon mriceblock, snowball, bouncing_snowball and mrbomb now

[supertux.git] / src / leveleditor.h

diff --git a/src/leveleditor.h b/src/leveleditor.h
index 50d8d01..32099a2 100644 (file)
--- a/src/leveleditor.h
+++ b/src/leveleditor.h
@@ -24,7 +24,7 @@
 #include <string>
 
 #include "video/drawing_context.h"
-#include "special/timer.h"
+#include "timer.h"
 #include "level.h"
 #include "level_subset.h"
 
@@ -105,7 +105,7 @@ private:
   void load_buttons_gfx();
   void free_buttons_gfx();
 
-  Level level;
+  Level* level;
   std::string level_filename;
 
   Sector* sector;  // current sector
@@ -113,7 +113,7 @@ private:
   std::string sector_name;
 
   std::set<std::string> level_subsets;
-  LevelSubset level_subset;
+  LevelSubset* level_subset;
   int level_nb;
 
   Menu* main_menu;
@@ -121,7 +121,7 @@ private:
   Menu* create_subset_menu;
   Menu* settings_menu;
 
-  bool left_button, middle_button;
+  bool left_button, middle_button, mouse_moved;
   bool done;
   bool show_grid;
 
@@ -129,8 +129,7 @@ private:
   float zoom;
 
   SDL_Event event;
-  Timer frame_timer;
-  Timer level_name_timer;
+  Timer2 level_name_timer;
 
   Surface *img_background_bt, *img_foreground_bt, *img_interactive_bt;
   Surface *img_save_level_bt, *img_setup_level_bt, *img_test_level_bt;