X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Fsupertux%2Fsector.cpp;h=24c43ab751856427074d125686af05365b36e320;hb=30a69f6d588ea92238f3b758799fed56c12e8628;hp=62fb618f3cd6e28b05dc7089d64e23b882bad4ba;hpb=aaba092373d753e421f2a23e26ecf5c22cf06d9d;p=supertux.git diff --git a/src/supertux/sector.cpp b/src/supertux/sector.cpp index 62fb618f3..24c43ab75 100644 --- a/src/supertux/sector.cpp +++ b/src/supertux/sector.cpp @@ -28,27 +28,29 @@ #include "object/brick.hpp" #include "object/bullet.hpp" #include "object/camera.hpp" +#include "object/cloud_particle_system.hpp" #include "object/coin.hpp" +#include "object/comet_particle_system.hpp" #include "object/display_effect.hpp" +#include "object/ghost_particle_system.hpp" #include "object/gradient.hpp" #include "object/invisible_block.hpp" #include "object/particlesystem.hpp" -#include "object/cloud_particle_system.hpp" -#include "object/ghost_particle_system.hpp" -#include "object/snow_particle_system.hpp" #include "object/particlesystem_interactive.hpp" #include "object/player.hpp" #include "object/portable.hpp" #include "object/pulsing_light.hpp" +#include "object/rain_particle_system.hpp" #include "object/smoke_cloud.hpp" +#include "object/snow_particle_system.hpp" #include "object/text_object.hpp" #include "object/tilemap.hpp" #include "physfs/ifile_stream.hpp" #include "scripting/squirrel_util.hpp" #include "supertux/collision.hpp" #include "supertux/constants.hpp" -#include "supertux/level.hpp" #include "supertux/globals.hpp" +#include "supertux/level.hpp" #include "supertux/object_factory.hpp" #include "supertux/spawn_point.hpp" #include "supertux/tile.hpp" @@ -168,15 +170,14 @@ Sector::parse_object(const std::string& name, const Reader& reader) return partsys; } else if(name == "money") { // for compatibility with old maps return new Jumpy(reader); + } else { + try { + return create_object(name, reader); + } catch(std::exception& e) { + log_warning << e.what() << "" << std::endl; + return 0; + } } - - try { - return create_object(name, reader); - } catch(std::exception& e) { - log_warning << e.what() << "" << std::endl; - } - - return 0; } void