Removed stray code from -nogl branch

[supertux.git] / src / level.cpp

diff --git a/src/level.cpp b/src/level.cpp
index 21ce9eb..f589380 100644 (file)
--- a/src/level.cpp
+++ b/src/level.cpp
@@ -29,30 +29,30 @@
 #include <memory>
 #include <stdexcept>
 
-#include "app/globals.h"
-#include "app/setup.h"
-#include "video/screen.h"
-#include "lisp/parser.h"
-#include "lisp/lisp.h"
-#include "lisp/list_iterator.h"
-#include "lisp/writer.h"
-#include "level.h"
-#include "math/physic.h"
-#include "sector.h"
-#include "tile.h"
-#include "resources.h"
-#include "object/gameobjs.h"
-#include "object/camera.h"
-#include "object/tilemap.h"
-#include "object/coin.h"
+#include "video/screen.hpp"
+#include "msg.hpp"
+#include "lisp/parser.hpp"
+#include "lisp/lisp.hpp"
+#include "lisp/list_iterator.hpp"
+#include "lisp/writer.hpp"
+#include "level.hpp"
+#include "physic.hpp"
+#include "sector.hpp"
+#include "tile.hpp"
+#include "resources.hpp"
+#include "file_system.hpp"
+#include "object/gameobjs.hpp"
+#include "object/camera.hpp"
+#include "object/tilemap.hpp"
+#include "object/coin.hpp"
 
 // test
-#include "flip_level_transformer.h"
+#include "flip_level_transformer.hpp"
 
 using namespace std;
 
 Level::Level()
-  : name("noname"), author("Mr. X"), timelimit(500)
+  : name("noname"), author("Mr. X"), extro_music("leveldone.ogg"), extro_length(7.0)
 {
 }
 
@@ -71,13 +71,6 @@ Level::load(const std::string& filepath)
     level->get("version", version);
     if(version == 1) {
       load_old_format(*level);
-
-#if 0
-      // test for now
-      FlipLevelTransformer* transformer = new FlipLevelTransformer();  
-      transformer->transform(this);
-#endif
-     
       return;
     }
 
@@ -87,20 +80,29 @@ Level::load(const std::string& filepath)
       if(token == "version") {
         iter.value()->get(version);
         if(version > 2) {
-          std::cerr << "Warning: level format newer than application.\n";
+          msg_warning("level format newer than application");
         }
       } else if(token == "name") {
         iter.value()->get(name);
       } else if(token == "author") {
         iter.value()->get(author);
-      } else if(token == "time") {
-        iter.value()->get(timelimit);
+      } else if(token == "extro") {
+        const lisp::Lisp* ext = iter.lisp();
+        lisp::ListIterator ext_iter(ext);
+        while(ext_iter.next()) {
+          const std::string& ext_token = ext_iter.item();
+          if(ext_token == "music") {
+            ext_iter.value()->get(extro_music);
+          } else if(ext_token == "length") {
+            ext_iter.value()->get(extro_length);
+          }
+        }
       } else if(token == "sector") {
         Sector* sector = new Sector;
         sector->parse(*(iter.lisp()));
         add_sector(sector);
       } else {
-        std::cerr << "Unknown token '" << token << "' in level file.\n";
+        msg_warning("Unknown token '" << token << "' in level file");
         continue;
       }
     }
@@ -117,7 +119,6 @@ Level::load_old_format(const lisp::Lisp& reader)
 {
   reader.get("name", name);
   reader.get("author", author);
-  reader.get("time", timelimit);
 
   Sector* sector = new Sector;
   sector->parse_old_format(reader);
@@ -127,12 +128,7 @@ Level::load_old_format(const lisp::Lisp& reader)
 void
 Level::save(const std::string& filename)
 {
-  std::string filepath = "levels/" + filename;
-  int last_slash = filepath.find_last_of('/');
-  FileSystem::fcreatedir(filepath.substr(0,last_slash).c_str());
-  filepath = st_dir + "/" + filepath;
-  ofstream file(filepath.c_str(), ios::out);
-  lisp::Writer* writer = new lisp::Writer(file);
+  lisp::Writer* writer = new lisp::Writer(filename);
 
   writer->write_comment("Level made using SuperTux's built-in Level Editor");
 
@@ -143,7 +139,6 @@ Level::save(const std::string& filename)
 
   writer->write_string("name", name, true);
   writer->write_string("author", author);
-  writer->write_int("time", timelimit);
 
   for(Sectors::iterator i = sectors.begin(); i != sectors.end(); ++i) {
     Sector* sector = *i;
@@ -155,7 +150,6 @@ Level::save(const std::string& filename)
   writer->end_list("supertux-level");
 
   delete writer;
-  file.close();
 }
 
 Level::~Level()