Reverted bigger parts of tuxdev patch:

[supertux.git] / src / worldmap / level.cpp

diff --git a/src/worldmap/level.cpp b/src/worldmap/level.cpp
index b6aa12c..129f493 100644 (file)
--- a/src/worldmap/level.cpp
+++ b/src/worldmap/level.cpp
@@ -32,8 +32,10 @@ namespace WorldMapNS
 {
 
 LevelTile::LevelTile(const std::string& basedir, const lisp::Lisp* lisp)
-  : solved(false), auto_path(true), basedir(basedir), picture_cached(false), picture(0)
+  : solved(false), auto_path(true), basedir(basedir), picture_cached(false),
+    picture(0)
 {
+  lisp->get("name", name);
   lisp->get("x", pos.x);
   lisp->get("y", pos.y);
 
@@ -42,7 +44,6 @@ LevelTile::LevelTile(const std::string& basedir, const lisp::Lisp* lisp)
   sprite.reset(sprite_manager->create(spritefile));
 
   lisp->get("extro-script", extro_script);
-  lisp->get("name", name);
 
   if (!PHYSFS_exists((basedir + name).c_str()))
   {