1 files changed, 64 insertions, 60 deletions
diff --git a/src/common/profile.h b/src/common/profile.h
index f084ece..ee17591 100644
--- a/src/common/profile.h
+++ b/src/common/profile.h
@@ -45,94 +45,98 @@ public:
     CProfile();
     virtual ~CProfile();
 
+    /** Set flag to force using ini file from current directory */
+    void SetUseCurrentDirectory(bool useCurrentDirectory);
+
     /** Loads colobot.ini from current directory
-        * \return return true on success
-        */
-    bool InitCurrentDirectory();
+     * \return return true on success
+     */
+    bool Init();
 
     /** Saves colobot.ini to current directory
-        * \return return true on success
-        */
-    bool SaveCurrentDirectory();
+     * \return return true on success
+     */
+    bool Save();
 
     /** Sets string value in section under specified key
-        * \param section
-        * \param key
-        * \param value
-        * \return return true on success
-        */
-    bool SetLocalProfileString(std::string section, std::string key, std::string value);
+     * \param section
+     * \param key
+     * \param value
+     * \return return true on success
+     */
+    bool SetStringProperty(std::string section, std::string key, std::string value);
 
     /** Gets string value in section under specified key
-        * \param section
-        * \param key
-        * \param buffer
-        * \return return true on success
-        */
-    bool GetLocalProfileString(std::string section, std::string key, std::string& buffer);
+     * \param section
+     * \param key
+     * \param buffer
+     * \return return true on success
+     */
+    bool GetStringProperty(std::string section, std::string key, std::string& buffer);
 
     /** Sets int value in section under specified key
-        * \param section
-        * \param key
-        * \param value
-        * \return return true on success
-        */
-    bool SetLocalProfileInt(std::string section, std::string key, int value);
+     * \param section
+     * \param key
+     * \param value
+     * \return return true on success
+     */
+    bool SetIntProperty(std::string section, std::string key, int value);
 
     /** Gets int value in section under specified key
-        * \param section
-        * \param key
-        * \param value
-        * \return return true on success
-        */
-    bool GetLocalProfileInt(std::string section, std::string key, int &value);
+     * \param section
+     * \param key
+     * \param value
+     * \return return true on success
+     */
+    bool GetIntProperty(std::string section, std::string key, int &value);
 
     /** Sets float value in section under specified key
-        * \param section
-        * \param key
-        * \param value
-        * \return return true on success
-        */
-    bool SetLocalProfileFloat(std::string section, std::string key, float value);
+     * \param section
+     * \param key
+     * \param value
+     * \return return true on success
+     */
+    bool SetFloatProperty(std::string section, std::string key, float value);
 
     /** Gets float value in section under specified key
-        * \param section
-        * \param key
-        * \param value
-        * \return return true on success
-        */
-    bool GetLocalProfileFloat(std::string section, std::string key, float &value);
+     * \param section
+     * \param key
+     * \param value
+     * \return return true on success
+     */
+    bool GetFloatProperty(std::string section, std::string key, float &value);
 
     /** Gets all values in section under specified key
-        * \param section
-        * \param key
-        * \return vector of values
-        */
-    std::vector< std::string > GetLocalProfileSection(std::string section, std::string key);
+     * \param section
+     * \param key
+     * \return vector of values
+     */
+    std::vector< std::string > GetSection(std::string section, std::string key);
 
     /** Sets current user directory
-        * \param dir
-        */
+     * \param dir
+     */
     void SetUserDir(std::string dir);
 
     /** Returns path based on current user. Replaces %user% in path with current user dir or
-        * uses default_dir param if no user dir is specified
-        * \param dir
-        * \param default_dir
-        * \return path
-        */
-    std::string GetUserBasedPath(std::string dir, std::string default_dir);
-
-    /** opy a file into the temporary folder.
-        * \param filename
-        * \return true on success
-        */
+     * uses default_dir param if no user dir is specified
+     * \param dir
+     * \param default_dir
+     * \return path
+     */
+    std::string GetUserBasedPath(std::string dir, std::string defaultDir);
+
+    /** Copy a file into the temporary folder.
+     * \param filename
+     * \return true on success
+     */
     bool CopyFileToTemp(std::string filename);
 
 private:
     boost::property_tree::ptree m_propertyTree;
     bool m_profileNeedSave;
     std::string m_userDirectory;
+    bool m_useCurrentDirectory;
 };
 
 //! Global function to get profile instance