X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=src%2Fsector.h;h=45a2cd53926987606318fb40710883d7983072ef;hb=44c614038ecdc2d1b69a6fee255d9c0ebc2a5098;hp=e08abbba8a82febcb54528ed7a43c4c64eea3e11;hpb=995d8328815cad1e6572b832832bb61a8aeaeb8e;p=supertux.git diff --git a/src/sector.h b/src/sector.h index e08abbba8..45a2cd539 100644 --- a/src/sector.h +++ b/src/sector.h @@ -67,8 +67,6 @@ public: Sector(); ~Sector(); - /// create new sector - static Sector *create(const std::string& name, size_t width, size_t height); /// read sector from lisp file void parse(LispReader& reader); void parse_old_format(LispReader& reader); @@ -88,6 +86,8 @@ public: /// adds a gameobject void add_object(GameObject* object); + void set_name(const std::string& name) + { this->name = name; } const std::string& get_name() const { return name; } @@ -102,16 +102,10 @@ public: case (or not). */ void collision_handler(); - void add_score(const Vector& pos, int s); - bool add_bullet(const Vector& pos, float xm, Direction dir); bool add_smoke_cloud(const Vector& pos); void add_floating_text(const Vector& pos, const std::string& text); - /** Flip the all the sector vertically. The purpose of this is to let - player to play the same level in a different way :) */ - void do_vertical_flip(); - /** @evil@ but can#t always be avoided in current design... */ static Sector* current() { return _current; } @@ -124,7 +118,7 @@ private: void collision_object(MovingObject* object1, MovingObject* object2); void load_music(); - GameObject* parseObject(const std::string& name, LispReader& reader); + GameObject* parse_object(const std::string& name, LispReader& reader); static Sector* _current; @@ -140,7 +134,6 @@ public: // some special objects, where we need direct access Player* player; TileMap* solids; - Background* background; Camera* camera; private: