X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=src%2Fleveleditor.h;h=912f8ea33c4b1255647fac42c0bc72203819809a;hb=ad4cc7039db0c05354df820cbd62f5ca7e651193;hp=11e2bd2152062918c0228cae860dcc11247af0cd;hpb=851e98df89229af086fa86c48adce2a397bf122a;p=supertux.git

diff --git a/src/leveleditor.h b/src/leveleditor.h
index 11e2bd215..912f8ea33 100644
--- a/src/leveleditor.h
+++ b/src/leveleditor.h
@@ -18,13 +18,11 @@
 #ifndef SUPERTUX_LEVELEDITOR_H
 #define SUPERTUX_LEVELEDITOR_H
 
-#include "SDL.h"
-
 #include <set>
 #include <string>
 
 #include "video/drawing_context.h"
-#include "special/timer.h"
+#include "timer.h"
 #include "level.h"
 #include "level_subset.h"
 
@@ -91,8 +89,7 @@ private:
   void load_level_subset(std::string filename);
   void load_level(std::string filename);
   void load_level(int nb);
-  void load_sector(std::string name);
-  void load_sector(Sector* sector);
+  void load_sector(size_t num);
 
   void save_level();
   void test_level();
@@ -108,6 +105,7 @@ private:
   Level* level;
   std::string level_filename;
 
+  size_t sectornum; // number of current sector
   Sector* sector;  // current sector
   TileMap *solids, *foregrounds, *backgrounds;
   std::string sector_name;
@@ -122,15 +120,14 @@ private:
   Menu* settings_menu;
 
   bool left_button, middle_button, mouse_moved;
+  int mouse_x, mouse_y;
   bool done;
   bool show_grid;
 
   Vector scroll;
   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;
@@ -138,12 +135,15 @@ private:
   Surface *img_previous_level_bt, *img_next_level_bt, *img_previous_sector_bt, *img_next_sector_bt;
 
   ButtonGroup *tiles_board, *tiles_layer, *level_options;
-  int cur_layer;
+  int gameobjs_first_id, cur_layer;
 
   std::vector <std::vector <int> > selection;
   Vector selection_ini, selection_end;
 
   bool level_changed;
+
+private:
+  Sector* create_sector(const std::string& name, size_t width, size_t height);
 };
 
 #endif