// $Id$
-//
+//
// SuperTux
-// Copyright (C) 2004 SuperTux Development Team, see AUTHORS for details
+// Copyright (C) 2006 Matthias Braun <matze@braunis.de>
//
// This program is free software; you can redistribute it and/or
// modify it under the terms of the GNU General Public License
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU General Public License for more details.
-//
+//
// You should have received a copy of the GNU General Public License
// along with this program; if not, write to the Free Software
// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
#include <stdexcept>
#include "video/screen.hpp"
+#include "log.hpp"
#include "lisp/parser.hpp"
#include "lisp/lisp.hpp"
#include "lisp/list_iterator.hpp"
using namespace std;
Level::Level()
- : name("noname"), author("Mr. X"), extro_music("leveldone.ogg"), extro_length(7.0)
+ : name("noname"), author("Mr. X")
{
}
if(token == "version") {
iter.value()->get(version);
if(version > 2) {
- std::cerr << "Warning: level format newer than application.\n";
+ log_warning << "level format newer than application" << std::endl;
}
} else if(token == "name") {
iter.value()->get(name);
} else if(token == "author") {
iter.value()->get(author);
- } 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";
+ log_warning << "Unknown token '" << token << "' in level file" << std::endl;
continue;
}
}