* Changed file loading to fix issue #73

* Moved few functions from misc.cpp to profile.cpp (used to set/get user dir)
* Removed some warnings
* More work to change const char* to std::string
* Some work on file path to fix issue #60 with bad slashes on POSIX platform

1 files changed, 4 insertions, 3 deletions

diff --git a/src/object/robotmain.cpp b/src/object/robotmain.cpp
index da6ac42..635fc4e 100644
--- a/src/object/robotmain.cpp
+++ b/src/object/robotmain.cpp
@@ -1187,7 +1187,7 @@ void CRobotMain::ChangePhase(Phase phase)
                 pe->SetFontType(Gfx::FONT_COLOBOT);
                 pe->SetEditCap(false);
                 pe->SetHiliteCap(false);
-                pe->ReadText("help/win.txt");
+                pe->ReadText(std::string("help/win.txt"));
             }
             else
             {
@@ -4094,8 +4094,9 @@ void CRobotMain::CreateScene(bool soluce, bool fixScene, bool resetObject)
         {
             OpString(line, "image", name);
             AddExt(name, ".png");
-            if (strstr(name, "%user%") != 0)
-                CopyFileToTemp(name);
+            if (strstr(name, "%user%") != 0) {
+                GetProfile().CopyFileToTemp(std::string(name));
+            }
 
             m_terrain->AddMaterial(OpInt(line, "id", 0),
                                    name,