// SuperTux
-// Copyright (C) 2004 Ingo Ruhnke <grumbel@gmx.de>
+// Copyright (C) 2004 Ingo Ruhnke <grumbel@gmail.com>
// Copyright (C) 2006 Christoph Sommer <christoph.sommer@2006.expires.deltadevelopment.de>
//
// This program is free software: you can redistribute it and/or modify
#include "sprite/sprite_manager.hpp"
#include "util/file_system.hpp"
#include "util/log.hpp"
+#include "util/reader.hpp"
#include "video/drawing_context.hpp"
#include "worldmap/level.hpp"
-namespace WorldMapNS {
+namespace worldmap {
-LevelTile::LevelTile(const std::string& basedir, const lisp::Lisp* lisp) :
- solved(false),
- auto_play(false),
- basedir(basedir),
+LevelTile::LevelTile(const std::string& basedir, const Reader& lisp) :
+ pos(),
+ title(),
+ solved(false),
+ perfect(false),
+ auto_play(false),
+ sprite(),
+ statistics(),
+ target_time(),
+ extro_script(),
+ basedir(basedir),
picture_cached(false),
picture(0)
{
- lisp->get("name", name);
- lisp->get("x", pos.x);
- lisp->get("y", pos.y);
- lisp->get("auto-play", auto_play);
+ lisp.get("name", name);
+ lisp.get("x", pos.x);
+ lisp.get("y", pos.y);
+ lisp.get("auto-play", auto_play);
std::string spritefile = "images/worldmap/common/leveldot.sprite";
- lisp->get("sprite", spritefile);
+ lisp.get("sprite", spritefile);
sprite = sprite_manager->create(spritefile);
- lisp->get("extro-script", extro_script);
+ lisp.get("extro-script", extro_script);
if (!PHYSFS_exists((basedir + name).c_str()))
{
{
}
-const Surface*
-LevelTile::get_picture()
-{
- if (picture_cached) return picture;
- picture_cached = true;
- std::string fname = FileSystem::strip_extension(basedir + name)+".jpg";
- if (!PHYSFS_exists(fname.c_str())) {
- return 0;
- }
- picture = new Surface(fname);
- return picture;
-}
-
-}
+} // namespace worldmap
/* EOF */