X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=src%2Fsector.h;h=51a135b99a10e3959ab914537f4fe492662d772a;hb=e409aaf88c618c2fc47ff8f9bbe523b8f271c795;hp=ad735f48d0073e1c1155fb97c922f0bd3a5de067;hpb=ebda3ab7ce3e30d8225228ffe8df3316b4f73645;p=supertux.git diff --git a/src/sector.h b/src/sector.h index ad735f48d..51a135b99 100644 --- a/src/sector.h +++ b/src/sector.h @@ -41,13 +41,7 @@ class TileMap; class Bullet; class CollisionGrid; class ScriptInterpreter; - -class SpawnPoint -{ -public: - std::string name; - Vector pos; -}; +class SpawnPoint; enum MusicType { LEVEL_MUSIC, @@ -73,7 +67,7 @@ public: void activate(const std::string& spawnpoint); void activate(const Vector& player_pos); - void action(float elapsed_time); + void update(float elapsed_time); void update_game_objects(); void draw(DrawingContext& context); @@ -101,7 +95,7 @@ public: bool add_smoke_cloud(const Vector& pos); void add_floating_text(const Vector& pos, const std::string& text); - /** @evil@ but can't always be avoided in current design... */ + /** get currently activated sector. */ static Sector* current() { return _current; } @@ -148,7 +142,7 @@ public: // TODO make this private again private: void fix_old_tiles(); - /// container for newly created objects, they'll be added in Sector::action + /// container for newly created objects, they'll be added in Sector::update GameObjects gameobjects_new; MusicType currentmusic;