X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=src%2Fsector.h;h=54772212044e2d968e7c5b3d85872295754df0aa;hb=d8c232ad6ebfbe431d9bd927d6e1ee88c94abd00;hp=8cec44cebe53cde69f51a569d96d8f7fa4e358d1;hpb=11ea32de7fcc2d667b13f95bb7097d808e6b0dd4;p=supertux.git diff --git a/src/sector.h b/src/sector.h index 8cec44ceb..547722120 100644 --- a/src/sector.h +++ b/src/sector.h @@ -73,7 +73,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 +101,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; } @@ -135,7 +135,6 @@ public: private: std::vector bullets; - ScriptInterpreter* interpreter; std::string init_script; public: // TODO make this private again @@ -149,7 +148,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;