diff -Nru supertux-0.6.3/.pc/.quilt_patches supertux-0.6.3/.pc/.quilt_patches --- supertux-0.6.3/.pc/.quilt_patches 2024-02-14 17:33:18.000000000 +0000 +++ supertux-0.6.3/.pc/.quilt_patches 2024-02-16 23:34:27.000000000 +0000 @@ -1 +1 @@ -/home/buildd/build-RECIPEBRANCHBUILD-3683202/chroot-autobuild/home/buildd/work/tree/recipe/debian/patches +/home/buildd/build-RECIPEBRANCHBUILD-3684406/chroot-autobuild/home/buildd/work/tree/recipe/debian/patches diff -Nru supertux-0.6.3/.pc/.quilt_series supertux-0.6.3/.pc/.quilt_series --- supertux-0.6.3/.pc/.quilt_series 2024-02-14 17:33:18.000000000 +0000 +++ supertux-0.6.3/.pc/.quilt_series 2024-02-16 23:34:27.000000000 +0000 @@ -1 +1 @@ -/home/buildd/build-RECIPEBRANCHBUILD-3683202/chroot-autobuild/home/buildd/work/tree/recipe/debian/patches/series +/home/buildd/build-RECIPEBRANCHBUILD-3684406/chroot-autobuild/home/buildd/work/tree/recipe/debian/patches/series diff -Nru supertux-0.6.3/debian/changelog supertux-0.6.3/debian/changelog --- supertux-0.6.3/debian/changelog 2024-02-14 17:33:18.000000000 +0000 +++ supertux-0.6.3/debian/changelog 2024-02-16 23:34:27.000000000 +0000 @@ -1,8 +1,8 @@ -supertux (0.6.3-2~git202402141733+17~ubuntu20.04.1) focal; urgency=low +supertux (0.6.3-2~git202402162334+17~ubuntu20.04.1) focal; urgency=low * Auto build. - -- Launchpad Package Builder Wed, 14 Feb 2024 17:33:18 +0000 + -- Launchpad Package Builder Fri, 16 Feb 2024 23:34:27 +0000 supertux (0.6.3) UNRELEASED; urgency=low diff -Nru supertux-0.6.3/debian/git-build-recipe.manifest supertux-0.6.3/debian/git-build-recipe.manifest --- supertux-0.6.3/debian/git-build-recipe.manifest 2024-02-14 17:33:18.000000000 +0000 +++ supertux-0.6.3/debian/git-build-recipe.manifest 2024-02-16 23:34:27.000000000 +0000 @@ -1,5 +1,5 @@ -# git-build-recipe format 0.4 deb-version {debupstream}-2~git202402141733+17 -lp:~supertux-dev/supertux/+git/github-clone git-commit:afc309aa5afc7362c8ec670a86013461ab2833fd +# git-build-recipe format 0.4 deb-version {debupstream}-2~git202402162334+17 +lp:~supertux-dev/supertux/+git/github-clone git-commit:4fa2f9d2a6e829c1a440b657998bd97971094e8c nest-part packaging lp:~supertux-dev/supertux/+git/supertux-debian debian debian git-commit:30d6625a450dd04d0a75f7ecf85fda0a8fc2acaa nest physfs lp:~supertux-dev/supertux/+git/external-physfs external/physfs git-commit:9bac3bc908b19997b301cc77f03008a90df55885 nest sexp-cpp lp:~supertux-dev/supertux/+git/external-sexp-cpp external/sexp-cpp git-commit:6018831abc1e5d5020c7b62f99962806dacf4c9f diff -Nru supertux-0.6.3/src/addon/md5.cpp supertux-0.6.3/src/addon/md5.cpp --- supertux-0.6.3/src/addon/md5.cpp 2024-02-14 17:32:35.000000000 +0000 +++ supertux-0.6.3/src/addon/md5.cpp 2024-02-16 23:33:19.000000000 +0000 @@ -170,7 +170,7 @@ } std::ostream& operator<<(std::ostream &stream, MD5 context) { - stream << context.hex_digest().c_str(); + stream << context.hex_digest(); return stream; } diff -Nru supertux-0.6.3/src/control/keyboard_config.cpp supertux-0.6.3/src/control/keyboard_config.cpp --- supertux-0.6.3/src/control/keyboard_config.cpp 2024-02-14 17:32:35.000000000 +0000 +++ supertux-0.6.3/src/control/keyboard_config.cpp 2024-02-16 23:33:19.000000000 +0000 @@ -27,7 +27,21 @@ KeyboardConfig::KeyboardConfig() : m_keymap(), - m_configurable_controls(), + m_configurable_controls({ + Control::UP, + Control::DOWN, + Control::LEFT, + Control::RIGHT, + Control::JUMP, + Control::ACTION, + Control::PEEK_LEFT, + Control::PEEK_RIGHT, + Control::PEEK_UP, + Control::PEEK_DOWN, + Control::CONSOLE, + Control::CHEAT_MENU, + Control::DEBUG_MENU + }), m_jump_with_up_kbd(false) { // initialize default keyboard map @@ -64,22 +78,6 @@ m_keymap[SDLK_k] = {2, Control::DOWN}; m_keymap[SDLK_o] = {2, Control::JUMP}; m_keymap[SDLK_u] = {2, Control::ACTION}; - - m_configurable_controls = { - Control::UP, - Control::DOWN, - Control::LEFT, - Control::RIGHT, - Control::JUMP, - Control::ACTION, - Control::PEEK_LEFT, - Control::PEEK_RIGHT, - Control::PEEK_UP, - Control::PEEK_DOWN, - Control::CONSOLE, - Control::CHEAT_MENU, - Control::DEBUG_MENU - }; } void diff -Nru supertux-0.6.3/src/gui/menu_paths.cpp supertux-0.6.3/src/gui/menu_paths.cpp --- supertux-0.6.3/src/gui/menu_paths.cpp 2024-02-14 17:32:35.000000000 +0000 +++ supertux-0.6.3/src/gui/menu_paths.cpp 2024-02-16 23:33:19.000000000 +0000 @@ -24,7 +24,7 @@ #include "object/path_object.hpp" #include "supertux/sector.hpp" -auto on_select = [](std::string path, PathObject& target, std::string path_ref) { +auto on_select = [](const std::string& path, PathObject& target, const std::string& path_ref) { return [path, &target, path_ref] { auto dialog = std::make_unique(); dialog->add_default_button(_("Clone"), [path, path_ref] { diff -Nru supertux-0.6.3/src/interface/control_textbox.cpp supertux-0.6.3/src/interface/control_textbox.cpp --- supertux-0.6.3/src/interface/control_textbox.cpp 2024-02-14 17:32:35.000000000 +0000 +++ supertux-0.6.3/src/interface/control_textbox.cpp 2024-02-16 23:33:19.000000000 +0000 @@ -420,7 +420,7 @@ } std::string -ControlTextbox::get_truncated_text(std::string text) const +ControlTextbox::get_truncated_text(const std::string& text) const { if (fits(text)) return text; diff -Nru supertux-0.6.3/src/interface/control_textbox.hpp supertux-0.6.3/src/interface/control_textbox.hpp --- supertux-0.6.3/src/interface/control_textbox.hpp 2024-02-14 17:32:35.000000000 +0000 +++ supertux-0.6.3/src/interface/control_textbox.hpp 2024-02-16 23:33:19.000000000 +0000 @@ -176,7 +176,7 @@ void delete_char_before_caret(); /** Returns the largest string fitting in the box. */ - std::string get_truncated_text(std::string text) const; + std::string get_truncated_text(const std::string& text) const; /** Changes m_current_offset so that the caret is visible */ void recenter_offset(); diff -Nru supertux-0.6.3/src/object/custom_particle_system.cpp supertux-0.6.3/src/object/custom_particle_system.cpp --- supertux-0.6.3/src/object/custom_particle_system.cpp 2024-02-14 17:32:35.000000000 +0000 +++ supertux-0.6.3/src/object/custom_particle_system.cpp 2024-02-16 23:33:19.000000000 +0000 @@ -1075,7 +1075,7 @@ CustomParticleSystem::get_random_texture() { float val = graphicsRandom.randf(texture_sum_odds); - for (auto texture : m_textures) + for (const auto& texture : m_textures) { val -= texture.likeliness; if (val <= 0) diff -Nru supertux-0.6.3/src/object/specialriser.cpp supertux-0.6.3/src/object/specialriser.cpp --- supertux-0.6.3/src/object/specialriser.cpp 2024-02-14 17:32:35.000000000 +0000 +++ supertux-0.6.3/src/object/specialriser.cpp 2024-02-16 23:33:19.000000000 +0000 @@ -20,11 +20,10 @@ #include "video/drawing_context.hpp" SpecialRiser::SpecialRiser(const Vector& pos, std::unique_ptr child, bool is_solid) : - m_start_pos(0.0f, 0.0f), + m_start_pos(pos), m_offset(0), m_child(std::move(child)) { - m_start_pos = pos; m_child->set_pos(pos - Vector(0,32)); set_pos(m_start_pos); m_col.m_bbox.set_size(m_child->get_bbox().get_width(), 32); diff -Nru supertux-0.6.3/src/squirrel/squirrel_environment.hpp supertux-0.6.3/src/squirrel/squirrel_environment.hpp --- supertux-0.6.3/src/squirrel/squirrel_environment.hpp 2024-02-14 17:32:35.000000000 +0000 +++ supertux-0.6.3/src/squirrel/squirrel_environment.hpp 2024-02-16 23:33:19.000000000 +0000 @@ -56,7 +56,7 @@ void expose(const std::string& name, std::unique_ptr script_object) { sq_pushobject(m_vm.get_vm(), m_table); - expose_object(m_vm.get_vm(), -1, std::move(script_object), name.c_str()); + expose_object(m_vm.get_vm(), -1, std::move(script_object), name); sq_pop(m_vm.get_vm(), 1); } void unexpose(const std::string& name); diff -Nru supertux-0.6.3/src/squirrel/squirrel_vm.cpp supertux-0.6.3/src/squirrel/squirrel_vm.cpp --- supertux-0.6.3/src/squirrel/squirrel_vm.cpp 2024-02-14 17:32:35.000000000 +0000 +++ supertux-0.6.3/src/squirrel/squirrel_vm.cpp 2024-02-16 23:33:19.000000000 +0000 @@ -23,9 +23,8 @@ #include "squirrel/squirrel_util.hpp" SquirrelVM::SquirrelVM() : - m_vm() + m_vm(sq_open(64)) { - m_vm = sq_open(64); if (m_vm == nullptr) throw std::runtime_error("Couldn't initialize squirrel vm"); } diff -Nru supertux-0.6.3/src/supertux/autotile_parser.cpp supertux-0.6.3/src/supertux/autotile_parser.cpp --- supertux-0.6.3/src/supertux/autotile_parser.cpp 2024-02-14 17:32:35.000000000 +0000 +++ supertux-0.6.3/src/supertux/autotile_parser.cpp 2024-02-16 23:33:19.000000000 +0000 @@ -179,19 +179,19 @@ } void -AutotileParser::parse_mask(std::string mask, std::vector& autotile_masks, bool solid) +AutotileParser::parse_mask(const std::string& mask, std::vector& autotile_masks, bool solid) { parse_mask(mask, autotile_masks, solid, false); } void -AutotileParser::parse_mask_corner(std::string mask, std::vector& autotile_masks) +AutotileParser::parse_mask_corner(const std::string& mask, std::vector& autotile_masks) { parse_mask(mask, autotile_masks, true, true); } void -AutotileParser::parse_mask(std::string mask, std::vector& autotile_masks, bool solid, bool is_corner) +AutotileParser::parse_mask(const std::string& mask, std::vector& autotile_masks, bool solid, bool is_corner) { size_t mask_size = is_corner ? 4 : 8; if (mask.size() != mask_size) diff -Nru supertux-0.6.3/src/supertux/autotile_parser.hpp supertux-0.6.3/src/supertux/autotile_parser.hpp --- supertux-0.6.3/src/supertux/autotile_parser.hpp 2024-02-14 17:32:35.000000000 +0000 +++ supertux-0.6.3/src/supertux/autotile_parser.hpp 2024-02-16 23:33:19.000000000 +0000 @@ -39,9 +39,9 @@ private: void parse_autotileset(const ReaderMapping& reader, bool corner); Autotile* parse_autotile(const ReaderMapping& reader, bool corner); - void parse_mask(std::string mask, std::vector& autotile_masks, bool solid); - void parse_mask_corner(std::string mask, std::vector& autotile_masks); - void parse_mask(std::string mask, std::vector& autotile_masks, bool solid, bool is_corner); + void parse_mask(const std::string& mask, std::vector& autotile_masks, bool solid); + void parse_mask_corner(const std::string& mask, std::vector& autotile_masks); + void parse_mask(const std::string& mask, std::vector& autotile_masks, bool solid, bool is_corner); private: AutotileParser(const AutotileParser&) = delete; diff -Nru supertux-0.6.3/src/supertux/menu/contrib_menu.cpp supertux-0.6.3/src/supertux/menu/contrib_menu.cpp --- supertux-0.6.3/src/supertux/menu/contrib_menu.cpp 2024-02-14 17:32:35.000000000 +0000 +++ supertux-0.6.3/src/supertux/menu/contrib_menu.cpp 2024-02-16 23:33:19.000000000 +0000 @@ -51,11 +51,11 @@ std::string addonpath = FileSystem::join("custom", addon_filename); if (physfsutil::is_directory(addonpath)) { - std::string addonlevelpath = FileSystem::join(addonpath.c_str(), "levels"); + std::string addonlevelpath = FileSystem::join(addonpath, "levels"); if (physfsutil::is_directory(addonlevelpath)) { physfsutil::enumerate_files(addonlevelpath, [addonlevelpath, &level_worlds](const std::string& filename) { - std::string filepath = FileSystem::join(addonlevelpath.c_str(), filename); + std::string filepath = FileSystem::join(addonlevelpath, filename); if (physfsutil::is_directory(filepath)) { level_worlds.push_back(filepath); diff -Nru supertux-0.6.3/src/worldmap/worldmap_state.cpp supertux-0.6.3/src/worldmap/worldmap_state.cpp --- supertux-0.6.3/src/worldmap/worldmap_state.cpp 2024-02-14 17:32:35.000000000 +0000 +++ supertux-0.6.3/src/worldmap/worldmap_state.cpp 2024-02-16 23:33:19.000000000 +0000 @@ -280,7 +280,7 @@ vm.get_or_create_table_entry("worlds"); /** Get or create state table for the current worldmap. **/ - vm.get_or_create_table_entry(m_worldmap.m_map_filename.c_str()); + vm.get_or_create_table_entry(m_worldmap.m_map_filename); // Save the current sector. vm.store_string("sector", sector.get_name());