X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=src%2Fleveleditor.h;h=5867d88e68d583cb2eb9fb3e895e50deb4fe0c78;hb=6f801c22d97251799740317fb1d0caf2e744b321;hp=50d8d0133c8a2be0aa986bdebe8a6bf6112e08aa;hpb=d5f3984577afe481c7e0596d3a01f86c8ae83945;p=supertux.git diff --git a/src/leveleditor.h b/src/leveleditor.h index 50d8d0133..5867d88e6 100644 --- a/src/leveleditor.h +++ b/src/leveleditor.h @@ -24,7 +24,7 @@ #include #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 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; @@ -144,6 +143,9 @@ private: Vector selection_ini, selection_end; bool level_changed; + +private: + Sector* create_sector(const std::string& name, size_t width, size_t height); }; #endif