Merge commit 'colobot-gold-0.1.4-alpha' into debian

* commit 'colobot-gold-0.1.4-alpha': (159 commits)
  Release alpha-0.1.4
  Fixed console spam when music files are not installed
  Updated data submodule
  Fixed amount of fireball damage done to allies, close issue #356
  Fixed icon on Windows; updated properties in .rc file
  COLOBOT: Gold Edition -> Colobot: Gold Edition
  Updated data submodule
  #335, #348, #352
  Updated INSTALL.md to reflect latest changes to music repository
  Added oggenc to Travis config
  Fallback to English files if translated ones are not available
  Removed duplicate license header
  Tools for measuring mission time without opening game window
  Fixed m_exitAfterMission
  Fixed #335 and #348
  Added -headless
  Changing resolution from commandline
  -runscene for userlevels
  Increased mission end accuracy
  Added some debug stuff, possible fix for #348 and #335
  ...

1 files changed, 69 insertions, 82 deletions

diff --git a/src/common/profile.h b/src/common/profile.h
index f084ece..d89c5d1 100644
--- a/src/common/profile.h
+++ b/src/common/profile.h
@@ -1,18 +1,21 @@
-// * This file is part of the COLOBOT source code
-// * Copyright (C) 2001-2008, Daniel ROUX & EPSITEC SA, www.epsitec.ch
-// *
-// * This program is free software: you can redistribute it and/or modify
-// * it under the terms of the GNU General Public License as published by
-// * the Free Software Foundation, either version 3 of the License, or
-// * (at your option) any later version.
-// *
-// * This program is distributed in the hope that it will be useful,
-// * but WITHOUT ANY WARRANTY; without even the implied warranty of
-// * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-// * GNU General Public License for more details.
-// *
-// * You should have received a copy of the GNU General Public License
-// * along with this program. If not, see  http://www.gnu.org/licenses/.
+/*
+ * This file is part of the Colobot: Gold Edition source code
+ * Copyright (C) 2001-2014, Daniel Roux, EPSITEC SA & TerranovaTeam
+ * http://epsiteс.ch; http://colobot.info; http://github.com/colobot
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see http://gnu.org/licenses
+ */
 
 /**
  * \file common/profile.h
@@ -45,94 +48,78 @@ 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);
-
-    /** Sets current user directory
-        * \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
-        */
-    bool CopyFileToTemp(std::string filename);
+     * \param section
+     * \param key
+     * \return vector of values
+     */
+    std::vector< std::string > GetSection(std::string section, std::string key);
 
 private:
     boost::property_tree::ptree m_propertyTree;
     bool m_profileNeedSave;
-    std::string m_userDirectory;
+    bool m_useCurrentDirectory;
 };
 
 //! Global function to get profile instance