X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=src%2Fleveleditor.cpp;h=2dab42180f14e539e021b9a35d5fb014dfc8e32b;hb=6ed1900da4edf7d7922f7a4626f95a83e34dff82;hp=71135d0ec780c0c4f4e46fe75f1805e48533f015;hpb=f9c5c22959ac3020274f3be3531d176e413b0220;p=supertux.git diff --git a/src/leveleditor.cpp b/src/leveleditor.cpp index 71135d0ec..2dab42180 100644 --- a/src/leveleditor.cpp +++ b/src/leveleditor.cpp @@ -33,10 +33,10 @@ #include "SDL_image.h" #include "leveleditor.h" -#include "screen/screen.h" +#include "video/screen.h" #include "defines.h" -#include "globals.h" -#include "setup.h" +#include "app/globals.h" +#include "app/setup.h" #include "sector.h" #include "tilemap.h" #include "gameloop.h" @@ -44,6 +44,7 @@ #include "player.h" #include "scene.h" #include "tile.h" +#include "tile_manager.h" #include "resources.h" #include "background.h" #include "camera.h" @@ -68,11 +69,15 @@ #define SELECT_W 2 // size of the selections lines #define SELECT_CLR 0, 255, 0, 255 // lines color (R, G, B, A) +/* Frames per second: */ + +#define FPS (1000 / 25) + enum { TM_IA, TM_BG, TM_FG }; LevelEditor::LevelEditor() { - level_subsets = dsubdirs("/levels", "level1.stl"); + level_subsets = FileSystem::dsubdirs("/levels", "level1.stl"); le_level_subset = new LevelSubset; le_level = NULL; @@ -96,7 +101,7 @@ LevelEditor::LevelEditor() le_mouse_clicked[LEFT] = false; le_mouse_clicked[RIGHT] = false; - le_selection = new Surface(datadir + "/images/leveleditor/select.png", USE_ALPHA); + le_selection = new Surface(datadir + "/images/leveleditor/select.png", true); select_tilegroup_menu_effect.init(false); select_objects_menu_effect.init(false); @@ -196,7 +201,7 @@ int LevelEditor::run(char* filename) le_level = NULL; le_levelnb = 1; - sound_manager->halt_music(); + SoundManager::get()->halt_music(); while (SDL_PollEvent(&event)) {} @@ -325,7 +330,7 @@ int LevelEditor::run(char* filename) default: if(i >= 1) { - if(load_level_subset(level_subsets.item[i-1])) + if(load_level_subset(subset_load_menu->item[i+1].text)) return 1; } break; @@ -390,7 +395,7 @@ int LevelEditor::run(char* filename) return done; } -int LevelEditor::load_level_subset(char *filename) +int LevelEditor::load_level_subset(const char *filename) { le_level_subset->load(filename); leveleditor_menu->get_item_by_id(MNID_SUBSETSETTINGS).kind = MN_GOTO; @@ -406,7 +411,7 @@ int LevelEditor::load_level_subset(char *filename) void LevelEditor::init_menus() { - int i; + int i = 0; leveleditor_menu = new Menu(); subset_load_menu = new Menu(); @@ -430,9 +435,9 @@ void LevelEditor::init_menus() subset_load_menu->additem(MN_LABEL, "Load Level Subset", 0, 0); subset_load_menu->additem(MN_HL, "", 0, 0); - for(i = 0; i < level_subsets.num_items; ++i) + for(std::set::iterator it = level_subsets.begin(); it != level_subsets.end(); ++it) { - subset_load_menu->additem(MN_ACTION,level_subsets.item[i],0,0, i+1); + subset_load_menu->additem(MN_ACTION,(*it),0,0, i+1); } subset_load_menu->additem(MN_HL,"",0,0); subset_load_menu->additem(MN_BACK,"Back",0,0); @@ -534,22 +539,22 @@ void LevelEditor::init_menus() void LevelEditor::update_level_settings_menu() { char str[80]; - int i; + std::set::iterator it; level_settings_menu->get_item_by_id(MNID_NAME).change_input(le_level->name.c_str()); level_settings_menu->get_item_by_id(MNID_AUTHOR).change_input(le_level->author.c_str()); - string_list_copy(level_settings_menu->get_item_by_id(MNID_SONG).list, dfiles("music/",NULL, "-fast")); - string_list_copy(level_settings_menu->get_item_by_id(MNID_BGIMG).list, dfiles("images/background",NULL, NULL)); - string_list_add_item(level_settings_menu->get_item_by_id(MNID_BGIMG).list,""); - string_list_add_item(level_settings_menu->get_item_by_id(MNID_PARTICLE).list,""); - string_list_add_item(level_settings_menu->get_item_by_id(MNID_PARTICLE).list,"snow"); - string_list_add_item(level_settings_menu->get_item_by_id(MNID_PARTICLE).list,"clouds"); - - if((i = string_list_find(level_settings_menu->get_item_by_id(MNID_SONG).list,le_level->get_sector("main")->song_title.c_str())) != -1) - level_settings_menu->get_item_by_id(MNID_SONG).list->active_item = i; - if((i = string_list_find(level_settings_menu->get_item_by_id(MNID_BGIMG).list,le_level->get_sector("main")->background->get_image().c_str())) != -1) - level_settings_menu->get_item_by_id(MNID_BGIMG).list->active_item = i; + level_settings_menu->get_item_by_id(MNID_SONG).list.first = FileSystem::dfiles("music/",NULL, "-fast"); + level_settings_menu->get_item_by_id(MNID_BGIMG).list.first = FileSystem::dfiles("images/background",NULL, NULL); + level_settings_menu->get_item_by_id(MNID_BGIMG).list.first.insert(""); + level_settings_menu->get_item_by_id(MNID_PARTICLE).list.first.insert(""); + level_settings_menu->get_item_by_id(MNID_PARTICLE).list.first.insert("snow"); + level_settings_menu->get_item_by_id(MNID_PARTICLE).list.first.insert("clouds"); + + if((it = level_settings_menu->get_item_by_id(MNID_SONG).list.first.find(le_level->get_sector("main")->song_title)) != level_settings_menu->get_item_by_id(MNID_SONG).list.first.end()) + level_settings_menu->get_item_by_id(MNID_SONG).list.second = it; + if((it = level_settings_menu->get_item_by_id(MNID_BGIMG).list.first.find(le_level->get_sector("main")->background->get_image())) != level_settings_menu->get_item_by_id(MNID_BGIMG).list.first.end()) + level_settings_menu->get_item_by_id(MNID_BGIMG).list.second = it; /* if((i = string_list_find(level_settings_menu->get_item_by_id(MNID_PARTICLE).list,le_level->get_sector("main")->particlesystem.c_str())) != -1) level_settings_menu->get_item_by_id(MNID_PARTICLE).list->active_item = i;*/ @@ -592,9 +597,9 @@ void LevelEditor::apply_level_settings_menu() le_level->name = level_settings_menu->get_item_by_id(MNID_NAME).input; le_level->author = level_settings_menu->get_item_by_id(MNID_AUTHOR).input; - if(le_level->get_sector("main")->background->get_image().compare(string_list_active(level_settings_menu->get_item_by_id(MNID_BGIMG).list)) != 0) + if(le_level->get_sector("main")->background->get_image().compare((*level_settings_menu->get_item_by_id(MNID_BGIMG).list.second)) != 0) { - le_level->get_sector("main")->background->set_image(string_list_active(level_settings_menu->get_item_by_id(MNID_BGIMG).list), atoi(level_settings_menu->get_item_by_id(MNID_BGSPEED).input)); + le_level->get_sector("main")->background->set_image((*level_settings_menu->get_item_by_id(MNID_BGIMG).list.second), atoi(level_settings_menu->get_item_by_id(MNID_BGSPEED).input)); i = true; } @@ -608,7 +613,7 @@ void LevelEditor::apply_level_settings_menu() le_level->load_gfx(); }*/ - le_level->get_sector("main")->song_title = string_list_active(level_settings_menu->get_item_by_id(MNID_SONG).list); + le_level->get_sector("main")->song_title = (*level_settings_menu->get_item_by_id(MNID_SONG).list.second); le_level->get_sector("main")->solids->resize( atoi(level_settings_menu->get_item_by_id(MNID_LENGTH).input), @@ -821,8 +826,8 @@ void LevelEditor::drawinterface(DrawingContext &context) le_object_properties_bt->draw(context); } - sprintf(str, "%d/%d", le_levelnb,le_level_subset->levels); - context.draw_text(white_text, str, Vector((le_level_subset->levels < 10) ? -10 : 0, 16), LAYER_GUI); + sprintf(str, "%d/%d", le_levelnb, le_level_subset->get_num_levels()); + context.draw_text(white_text, str, Vector((le_level_subset->get_num_levels() < 10) ? -10 : 0, 16), LAYER_GUI); if(!le_help_shown) context.draw_text(white_small_text, "F1 for Help", Vector(10, 430), LAYER_GUI); @@ -945,10 +950,10 @@ void LevelEditor::change_object_properties(GameObject *pobj) object_properties_menu->additem(MN_STRINGSELECT,"Kind",0,0,1); for(int i = 0; i < NUM_BadGuyKinds; ++i) { - string_list_add_item(object_properties_menu->get_item_by_id(1).list, - badguykind_to_string(static_cast(i)).c_str()); + object_properties_menu->get_item_by_id(1).list.first.insert( + badguykind_to_string(static_cast(i))); if(pbad->kind == i) - object_properties_menu->get_item_by_id(1).list->active_item = i; + object_properties_menu->get_item_by_id(1).list.second = object_properties_menu->get_item_by_id(1).list.first.find(badguykind_to_string(static_cast(i))); } object_properties_menu->additem(MN_TOGGLE,"StayOnPlatform",pbad->stay_on_platform,0,2); } @@ -979,7 +984,7 @@ void LevelEditor::change_object_properties(GameObject *pobj) BadGuy* pbad = dynamic_cast(pobj); if(pbad != 0) { BadGuy* pbad = dynamic_cast(pobj); - pbad->kind = badguykind_from_string(string_list_active(object_properties_menu->get_item_by_id(1).list)); + pbad->kind = badguykind_from_string((*object_properties_menu->get_item_by_id(1).list.second)); pbad->stay_on_platform = object_properties_menu->get_item_by_id(2).toggled; } loop = false; @@ -1152,7 +1157,7 @@ void LevelEditor::checkevents() le_next_level_bt->event(event); if(le_next_level_bt->get_state() == BUTTON_CLICKED) { - if(le_levelnb < le_level_subset->levels) + if(le_levelnb < le_level_subset->get_num_levels()) { goto_level(le_levelnb+1); } @@ -1164,8 +1169,8 @@ void LevelEditor::checkevents() Surface* surf = new Surface(le_level->get_sector("main")->background->get_image(), false); if(confirm_dialog(surf, str)) { - new_lev.save(le_level_subset->name.c_str()); - le_level_subset->levels = le_levelnb; + le_level_subset->add_level("newlevel.stl"); + new_lev.save(le_level_subset->get_level_filename(le_levelnb+1)); goto_level(le_levelnb); } if(surf != NULL) @@ -1682,7 +1687,7 @@ void LevelEditor::testlevel() session.run(); player_status.reset(); - sound_manager->halt_music(); + SoundManager::get()->halt_music(); Menu::set_current(NULL); }