X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=src%2Fworld.cpp;h=0c28cb0011097e6180969176b7cf025c6dfd8467;hb=157cef71aeb9ae25b7bb90f37dda11bc09329d11;hp=9ba5d1867ab0786d6eb6f9f1ce1a1c57b5062ffb;hpb=439727da7695d42e55a008268bcfa860262eee4c;p=supertux.git

diff --git a/src/world.cpp b/src/world.cpp
index 9ba5d1867..0c28cb001 100644
--- a/src/world.cpp
+++ b/src/world.cpp
@@ -48,16 +48,20 @@ World::World(const std::string& filename, int level_nr)
   // world calls child functions
   current_ = this;
 
+  tux = new Player(displaymanager);
+  add_object(tux);
+  
   level = new Level();
+  camera = new Camera(tux, level);
+  add_object(camera);                 
+
   if(level_nr >= 0) {
     level->load(filename, level_nr, this);
   } else {
     level->load(filename, this);
   }
-
-  tux = new Player(displaymanager);
-  add_object(tux);
-
+  tux->move(level->start_pos);
+  
   set_defaults();
 
   level->load_gfx();
@@ -75,9 +79,6 @@ World::World(const std::string& filename, int level_nr)
   add_object(new TileMap(displaymanager, level));
   level->load_song();
 
-  camera = new Camera(tux, level);
-  add_object(camera);               
-
   apply_bonuses();
 }