X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=src%2Fleveleditor.h;h=912f8ea33c4b1255647fac42c0bc72203819809a;hb=9599042661b468aae7bd34dca05441c0ebc93ad7;hp=5867d88e68d583cb2eb9fb3e895e50deb4fe0c78;hpb=6f801c22d97251799740317fb1d0caf2e744b321;p=supertux.git diff --git a/src/leveleditor.h b/src/leveleditor.h index 5867d88e6..912f8ea33 100644 --- a/src/leveleditor.h +++ b/src/leveleditor.h @@ -18,8 +18,6 @@ #ifndef SUPERTUX_LEVELEDITOR_H #define SUPERTUX_LEVELEDITOR_H -#include "SDL.h" - #include #include @@ -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,13 +120,13 @@ 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; Timer2 level_name_timer; Surface *img_background_bt, *img_foreground_bt, *img_interactive_bt; @@ -137,7 +135,7 @@ 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 > selection; Vector selection_ini, selection_end;