Use implicit_depends for generating the wrapper, which is only a 2.6 feature so bumpi...

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

diff --git a/src/worldmap/worldmap.cpp b/src/worldmap/worldmap.cpp
index 1f2e377..50aaddd 100644 (file)
--- a/src/worldmap/worldmap.cpp
+++ b/src/worldmap/worldmap.cpp
@@ -355,7 +355,7 @@ WorldMap::load(const std::string& filename)
         add_object(teleporter);
       } else if(iter.item() == "ambient-light") {
         std::vector<float> vColor;
-        sector->get_vector( "ambient-light", vColor );
+        sector->get( "ambient-light", vColor );
         if(vColor.size() < 3) {
           log_warning << "(ambient-light) requires a color as argument" << std::endl;
         } else {
@@ -539,7 +539,7 @@ WorldMap::finished_level(Level* gamelevel)
       std::istringstream in(level->extro_script);
       run_script(in, "worldmap:extro_script");
     } catch(std::exception& e) {
-      log_fatal << "Couldn't run level-extro-script: " << e.what() << std::endl;
+      log_warning << "Couldn't run level-extro-script: " << e.what() << std::endl;
     }
   }
 }
@@ -577,8 +577,6 @@ WorldMap::update(float delta)
   if(!in_level) {
     Menu* menu = Menu::current();
     if(menu != NULL) {
-      menu->update();
-
       if(menu == worldmap_menu.get()) {
         switch (worldmap_menu->check())
         {