X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=src%2Fleveleditor.h;h=5fef8801b26a9a62663c4e5062c8b9549a6bab28;hb=7bbb0ef907ebec48718560425a0147b31307f7fd;hp=11e2bd2152062918c0228cae860dcc11247af0cd;hpb=851e98df89229af086fa86c48adce2a397bf122a;p=supertux.git diff --git a/src/leveleditor.h b/src/leveleditor.h index 11e2bd215..5fef8801b 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" @@ -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; @@ -138,12 +137,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 > selection; Vector selection_ini, selection_end; bool level_changed; + +private: + Sector* create_sector(const std::string& name, size_t width, size_t height); }; #endif