X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Fworldmap%2Fworldmap.hpp;h=9263307eb0a5f76b96a782f67dc432dc5427ae7b;hb=a113d3bd1feddd510e3b2852b0d42522735eee40;hp=ea847054b4b5df4a9c5f5964e36b99d4e6913559;hpb=ff4c6994b952e26b854461d739eb3bcbfc30719f;p=supertux.git diff --git a/src/worldmap/worldmap.hpp b/src/worldmap/worldmap.hpp index ea847054b..9263307eb 100644 --- a/src/worldmap/worldmap.hpp +++ b/src/worldmap/worldmap.hpp @@ -86,9 +86,9 @@ private: typedef std::vector GameObjects; GameObjects game_objects; TileMap* solids; - + std::auto_ptr tile_manager; - + public: /** Variables to deal with the passive map messages */ Timer passive_message_timer; @@ -112,7 +112,7 @@ private: HSQOBJECT worldmap_table; typedef std::vector ScriptList; - ScriptList scripts; + ScriptList scripts; std::string force_spawnpoint; /**< if set, spawnpoint will be forced to this value */ @@ -168,7 +168,7 @@ public: { return name; } /** - * runs a script in the context of the worldmap (and keeps a reference to + * runs a script in the context of the worldmap (and keeps a reference to * the script (so the script gets destroyed when the worldmap is destroyed) */ HSQUIRRELVM run_script(std::istream& in, const std::string& sourcename); @@ -189,7 +189,7 @@ private: void draw_status(DrawingContext& context); void calculate_total_stats(); - void load(const std::string& filename); + void load(const std::string& filename); void on_escape_press(); };