1.1 --- a/level/src/level.h	Fri May 25 05:28:20 2012 +0300
     1.2 +++ b/level/src/level.h	Sun May 27 07:00:48 2012 +0300
     1.3 @@ -6,12 +6,12 @@
     1.4  #include <imago2.h>
     1.5  #include "tinyxml2.h"
     1.6  
     1.7 -class LevelMap;
     1.8 +class Terrain;
     1.9  
    1.10  class Level {
    1.11  private:
    1.12  	tinyxml2::XMLDocument xml;
    1.13 -	std::map<std::string, LevelMap> levelmaps;
    1.14 +	Terrain *terrain;
    1.15  
    1.16  public:
    1.17  	Level();
    1.18 @@ -22,31 +22,4 @@
    1.19  	void draw() const;
    1.20  };
    1.21  
    1.22 -class LevelMap {
    1.23 -private:
    1.24 -	float scale;
    1.25 -	img_pixmap img;
    1.26 -	char *name;
    1.27 -
    1.28 -	void init();
    1.29 -	void destroy();
    1.30 -
    1.31 -public:
    1.32 -	LevelMap();
    1.33 -	~LevelMap();
    1.34 -
    1.35 -	LevelMap(const LevelMap &map);
    1.36 -	LevelMap &operator =(const LevelMap &map);
    1.37 -
    1.38 -	// move constructor/op=
    1.39 -	LevelMap(LevelMap &&map);
    1.40 -	LevelMap &operator =(LevelMap &&map);
    1.41 -
    1.42 -	bool load(tinyxml2::XMLElement *xelem);
    1.43 -
    1.44 -	float get_scale() const;
    1.45 -	const img_pixmap *get_pixmap() const;
    1.46 -	const char *get_name() const;
    1.47 -};
    1.48 -
    1.49  #endif	// LEVEL_H_