Moved parsing of "tiles" section into separate function

[supertux.git] / src / supertux / world.hpp

diff --git a/src/supertux/world.hpp b/src/supertux/world.hpp
index cffc0a4..8ab6262 100644 (file)
--- a/src/supertux/world.hpp
+++ b/src/supertux/world.hpp
@@ -23,13 +23,13 @@
 
 class World
 {
+public:
+  static World* current()
+  {
+    return current_;
+  }
+
 private:
-  std::vector<std::string> levels;
-  std::string basedir;
-  std::string savegame_filename;
-  /// squirrel table that saves persistent state (about the world)
-  HSQOBJECT state_table;
-  HSQOBJECT world_thread;
   static World* current_;
 
 public:
@@ -42,20 +42,25 @@ public:
   void save_state();
   void load_state();
 
-  const std::string& get_level_filename(unsigned int i) const;
   unsigned int get_num_levels() const;
 
+  const std::string& get_level_filename(unsigned int i) const;
   const std::string& get_basedir() const;
-
-  static World* current()
-  {
-    return current_;
-  }
+  const std::string& get_title() const;
 
   void run();
 
+private:
+  std::vector<std::string> levels;
+  std::string basedir;
+  std::string savegame_filename;
+  /// squirrel table that saves persistent state (about the world)
+  HSQOBJECT state_table;
+  HSQOBJECT world_thread;
   std::string title;
   std::string description;
+
+public:
   bool hide_from_contribs;
   bool is_levelset;
 };