X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=src%2Fworldmap%2Fworldmap.hpp;h=9263307eb0a5f76b96a782f67dc432dc5427ae7b;hb=57763c519b16bf063add4b46bf2856873de9db61;hp=9bf35b28ec5c1c321476ef75ee1134ef297abda9;hpb=6141e1672ec08427b989ca245508f0c1648ce68b;p=supertux.git diff --git a/src/worldmap/worldmap.hpp b/src/worldmap/worldmap.hpp index 9bf35b28e..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,14 +168,14 @@ 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); /** * switch to another worldmap. - * filename is relative to current world's path + * filename is relative to data root path */ void change(const std::string& filename, const std::string& force_spawnpoint=""); @@ -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(); };