Merge with dev

1 files changed, 32 insertions, 225 deletions

diff --git a/src/object/robotmain.cpp b/src/object/robotmain.cpp
index a409aa0..c274367 100644
--- a/src/object/robotmain.cpp
+++ b/src/object/robotmain.cpp
@@ -717,11 +717,11 @@ CRobotMain::CRobotMain(CApplication* app, bool loadProfile)
 
     if (loadProfile)
     {
-        if (GetProfile().GetLocalProfileFloat("Edit", "FontSize",    fValue)) m_fontSize    = fValue;
-        if (GetProfile().GetLocalProfileFloat("Edit", "WindowPosX",  fValue)) m_windowPos.x = fValue;
-        if (GetProfile().GetLocalProfileFloat("Edit", "WindowPosY",  fValue)) m_windowPos.y = fValue;
-        if (GetProfile().GetLocalProfileFloat("Edit", "WindowDimX",  fValue)) m_windowDim.x = fValue;
-        if (GetProfile().GetLocalProfileFloat("Edit", "WindowDimY",  fValue)) m_windowDim.y = fValue;
+        if (GetProfile().GetFloatProperty("Edit", "FontSize",    fValue)) m_fontSize    = fValue;
+        if (GetProfile().GetFloatProperty("Edit", "WindowPosX",  fValue)) m_windowPos.x = fValue;
+        if (GetProfile().GetFloatProperty("Edit", "WindowPosY",  fValue)) m_windowPos.y = fValue;
+        if (GetProfile().GetFloatProperty("Edit", "WindowDimX",  fValue)) m_windowDim.x = fValue;
+        if (GetProfile().GetFloatProperty("Edit", "WindowDimY",  fValue)) m_windowDim.y = fValue;
     }
 
     m_IOPublic = false;
@@ -731,11 +731,11 @@ CRobotMain::CRobotMain(CApplication* app, bool loadProfile)
 
     if (loadProfile)
     {
-        if (GetProfile().GetLocalProfileInt  ("Edit", "IOPublic", iValue)) m_IOPublic = iValue;
-        if (GetProfile().GetLocalProfileFloat("Edit", "IOPosX",   fValue)) m_IOPos.x  = fValue;
-        if (GetProfile().GetLocalProfileFloat("Edit", "IOPosY",   fValue)) m_IOPos.y  = fValue;
-        if (GetProfile().GetLocalProfileFloat("Edit", "IODimX",   fValue)) m_IODim.x  = fValue;
-        if (GetProfile().GetLocalProfileFloat("Edit", "IODimY",   fValue)) m_IODim.y  = fValue;
+        if (GetProfile().GetIntProperty  ("Edit", "IOPublic", iValue)) m_IOPublic = iValue;
+        if (GetProfile().GetFloatProperty("Edit", "IOPosX",   fValue)) m_IOPos.x  = fValue;
+        if (GetProfile().GetFloatProperty("Edit", "IOPosY",   fValue)) m_IOPos.y  = fValue;
+        if (GetProfile().GetFloatProperty("Edit", "IODimX",   fValue)) m_IODim.x  = fValue;
+        if (GetProfile().GetFloatProperty("Edit", "IODimY",   fValue)) m_IODim.y  = fValue;
     }
 
     m_short->FlushShortcuts();
@@ -753,7 +753,7 @@ CRobotMain::CRobotMain(CApplication* app, bool loadProfile)
     g_unit = UNIT;
 
     m_gamerName = "";
-    if (loadProfile) GetProfile().GetLocalProfileString("Gamer", "LastName", m_gamerName);
+    if (loadProfile) GetProfile().GetStringProperty("Gamer", "LastName", m_gamerName);
     SetGlobalGamerName(m_gamerName);
     ReadFreeParam();
     if (loadProfile) m_dialog->SetupRecall();
@@ -962,18 +962,18 @@ void CRobotMain::CreateIni()
 {
     m_dialog->SetupMemorize();
 
-    GetProfile().SetLocalProfileFloat("Edit", "FontSize", m_fontSize);
-    GetProfile().SetLocalProfileFloat("Edit", "WindowPosX", m_windowPos.x);
-    GetProfile().SetLocalProfileFloat("Edit", "WindowPosY", m_windowPos.y);
-    GetProfile().SetLocalProfileFloat("Edit", "WindowDimX", m_windowDim.x);
-    GetProfile().SetLocalProfileFloat("Edit", "WindowDimY", m_windowDim.y);
-    GetProfile().SetLocalProfileInt("Edit", "IOPublic", m_IOPublic);
-    GetProfile().SetLocalProfileFloat("Edit", "IOPosX", m_IOPos.x);
-    GetProfile().SetLocalProfileFloat("Edit", "IOPosY", m_IOPos.y);
-    GetProfile().SetLocalProfileFloat("Edit", "IODimX", m_IODim.x);
-    GetProfile().SetLocalProfileFloat("Edit", "IODimY", m_IODim.y);
+    GetProfile().SetFloatProperty("Edit", "FontSize", m_fontSize);
+    GetProfile().SetFloatProperty("Edit", "WindowPosX", m_windowPos.x);
+    GetProfile().SetFloatProperty("Edit", "WindowPosY", m_windowPos.y);
+    GetProfile().SetFloatProperty("Edit", "WindowDimX", m_windowDim.x);
+    GetProfile().SetFloatProperty("Edit", "WindowDimY", m_windowDim.y);
+    GetProfile().SetIntProperty("Edit", "IOPublic", m_IOPublic);
+    GetProfile().SetFloatProperty("Edit", "IOPosX", m_IOPos.x);
+    GetProfile().SetFloatProperty("Edit", "IOPosY", m_IOPos.y);
+    GetProfile().SetFloatProperty("Edit", "IODimX", m_IODim.x);
+    GetProfile().SetFloatProperty("Edit", "IODimY", m_IODim.y);
 
-    GetProfile().SaveCurrentDirectory();
+    GetProfile().Save();
 }
 
 void CRobotMain::SetDefaultInputBindings()
@@ -2279,7 +2279,7 @@ float CRobotMain::GetGameTime()
 void CRobotMain::SetFontSize(float size)
 {
     m_fontSize = size;
-    GetProfile().SetLocalProfileFloat("Edit", "FontSize", m_fontSize);
+    GetProfile().SetFloatProperty("Edit", "FontSize", m_fontSize);
 }
 
 float CRobotMain::GetFontSize()
@@ -2291,8 +2291,8 @@ float CRobotMain::GetFontSize()
 void CRobotMain::SetWindowPos(Math::Point pos)
 {
     m_windowPos = pos;
-    GetProfile().SetLocalProfileFloat("Edit", "WindowPosX", m_windowPos.x);
-    GetProfile().SetLocalProfileFloat("Edit", "WindowPosY", m_windowPos.y);
+    GetProfile().SetFloatProperty("Edit", "WindowPosX", m_windowPos.x);
+    GetProfile().SetFloatProperty("Edit", "WindowPosY", m_windowPos.y);
 }
 
 Math::Point CRobotMain::GetWindowPos()
@@ -2303,8 +2303,8 @@ Math::Point CRobotMain::GetWindowPos()
 void CRobotMain::SetWindowDim(Math::Point dim)
 {
     m_windowDim = dim;
-    GetProfile().SetLocalProfileFloat("Edit", "WindowDimX", m_windowDim.x);
-    GetProfile().SetLocalProfileFloat("Edit", "WindowDimY", m_windowDim.y);
+    GetProfile().SetFloatProperty("Edit", "WindowDimX", m_windowDim.x);
+    GetProfile().SetFloatProperty("Edit", "WindowDimY", m_windowDim.y);
 }
 
 Math::Point CRobotMain::GetWindowDim()
@@ -2317,7 +2317,7 @@ Math::Point CRobotMain::GetWindowDim()
 void CRobotMain::SetIOPublic(bool mode)
 {
     m_IOPublic = mode;
-    GetProfile().SetLocalProfileInt("Edit", "IOPublic", m_IOPublic);
+    GetProfile().SetIntProperty("Edit", "IOPublic", m_IOPublic);
 }
 
 bool CRobotMain::GetIOPublic()
@@ -2328,8 +2328,8 @@ bool CRobotMain::GetIOPublic()
 void CRobotMain::SetIOPos(Math::Point pos)
 {
     m_IOPos = pos;
-    GetProfile().SetLocalProfileFloat("Edit", "IOPosX", m_IOPos.x);
-    GetProfile().SetLocalProfileFloat("Edit", "IOPosY", m_IOPos.y);
+    GetProfile().SetFloatProperty("Edit", "IOPosX", m_IOPos.x);
+    GetProfile().SetFloatProperty("Edit", "IOPosY", m_IOPos.y);
 }
 
 Math::Point CRobotMain::GetIOPos()
@@ -2340,8 +2340,8 @@ Math::Point CRobotMain::GetIOPos()
 void CRobotMain::SetIODim(Math::Point dim)
 {
     m_IODim = dim;
-    GetProfile().SetLocalProfileFloat("Edit", "IODimX", m_IODim.x);
-    GetProfile().SetLocalProfileFloat("Edit", "IODimY", m_IODim.y);
+    GetProfile().SetFloatProperty("Edit", "IODimX", m_IODim.x);
+    GetProfile().SetFloatProperty("Edit", "IODimY", m_IODim.y);
 }
 
 Math::Point CRobotMain::GetIODim()
@@ -3624,199 +3624,6 @@ char* SkipNum(char *p)
     return p;
 }
 
-//! Conversion of units
-void CRobotMain::Convert()
-{
-    char* base = m_dialog->GetSceneName();
-    int rank = m_dialog->GetSceneRank();
-
-    //TODO change line to string
-    char line[500];
-    std::string tempLine;
-
-    m_dialog->BuildSceneName(tempLine, base, rank);
-    strcpy(line, tempLine.c_str());
-    FILE* file = fopen(line, "r");
-    if (file == NULL) return;
-
-    strcpy(line+strlen(line)-4, ".new");
-    FILE* fileNew = fopen(line, "w");
-    if (fileNew == NULL) return;
-
-    char lineNew[500];
-    char s[200];
-
-    while (fgets(line, 500, file) != NULL)
-    {
-        strcpy(lineNew, line);
-
-        if (Cmd(line, "DeepView"))
-        {
-            char* p = strstr(line, "air=");
-            if (p != 0)
-            {
-                float value = OpFloat(line, "air", 500.0f);
-                value /= g_unit;
-                p[0] = 0;
-                p = SkipNum(p+4);
-                strcpy(lineNew, line);
-                strcat(lineNew, "air=");
-                sprintf(s, "%.2f", value);
-                strcat(lineNew, s);
-                strcat(lineNew, " ");
-                strcat(lineNew, p);
-            }
-            strcpy(line, lineNew);
-
-            p = strstr(line, "water=");
-            if (p != 0)
-            {
-                float value = OpFloat(line, "water", 100.0f);
-                value /= g_unit;
-                p[0] = 0;
-                p = SkipNum(p+6);
-                strcpy(lineNew, line);
-                strcat(lineNew, "water=");
-                sprintf(s, "%.2f", value);
-                strcat(lineNew, s);
-                strcat(lineNew, " ");
-                strcat(lineNew, p);
-            }
-            strcpy(line, lineNew);
-        }
-
-        if (Cmd(line, "TerrainGenerate"))
-        {
-            char* p = strstr(line, "vision=");
-            if (p != 0)
-            {
-                float value = OpFloat(line, "vision", 500.0f);
-                value /= g_unit;
-                p[0] = 0;
-                p = SkipNum(p+7);
-                strcpy(lineNew, line);
-                strcat(lineNew, "vision=");
-                sprintf(s, "%.2f", value);
-                strcat(lineNew, s);
-                strcat(lineNew, " ");
-                strcat(lineNew, p);
-            }
-        }
-
-        if (Cmd(line, "CreateObject") ||
-            Cmd(line, "CreateSpot"))
-        {
-            char* p = strstr(line, "pos=");
-            if (p != 0)
-            {
-                Math::Vector pos = OpPos(line, "pos");
-                pos.x /= g_unit;
-                pos.y /= g_unit;
-                pos.z /= g_unit;
-                p[0] = 0;
-                p = SkipNum(p+4);
-                p = SkipNum(p+1);
-                strcpy(lineNew, line);
-                strcat(lineNew, "pos=");
-                sprintf(s, "%.2f", pos.x);
-                strcat(lineNew, s);
-                strcat(lineNew, ";");
-                sprintf(s, "%.2f", pos.z);
-                strcat(lineNew, s);
-                strcat(lineNew, " ");
-                strcat(lineNew, p);
-            }
-        }
-
-        if (Cmd(line, "EndMissionTake") || Cmd(line, "AudioChange"))
-        {
-            char* p = strstr(line, "pos=");
-            if (p != 0)
-            {
-                Math::Vector pos = OpPos(line, "pos");
-                pos.x /= g_unit;
-                pos.y /= g_unit;
-                pos.z /= g_unit;
-                p[0] = 0;
-                p = SkipNum(p+4);
-                p = SkipNum(p+1);
-                strcpy(lineNew, line);
-                strcat(lineNew, "pos=");
-                sprintf(s, "%.2f", pos.x);
-                strcat(lineNew, s);
-                strcat(lineNew, ";");
-                sprintf(s, "%.2f", pos.z);
-                strcat(lineNew, s);
-                strcat(lineNew, " ");
-                strcat(lineNew, p);
-            }
-            strcpy(line, lineNew);
-
-            p = strstr(line, "dist=");
-            if (p != 0)
-            {
-                float value = OpFloat(line, "dist", 32.0f);
-                value /= g_unit;
-                p[0] = 0;
-                p = SkipNum(p+5);
-                strcpy(lineNew, line);
-                strcat(lineNew, "dist=");
-                sprintf(s, "%.2f", value);
-                strcat(lineNew, s);
-                strcat(lineNew, " ");
-                strcat(lineNew, p);
-            }
-            strcpy(line, lineNew);
-        }
-
-        if (Cmd(line, "Camera"))
-        {
-            char* p = strstr(line, "pos=");
-            if (p != 0)
-            {
-                Math::Vector pos = OpPos(line, "pos");
-                pos.x /= g_unit;
-                pos.y /= g_unit;
-                pos.z /= g_unit;
-                p[0] = 0;
-                p = SkipNum(p+4);
-                p = SkipNum(p+1);
-                strcpy(lineNew, line);
-                strcat(lineNew, "pos=");
-                sprintf(s, "%.2f", pos.x);
-                strcat(lineNew, s);
-                strcat(lineNew, ";");
-                sprintf(s, "%.2f", pos.z);
-                strcat(lineNew, s);
-                strcat(lineNew, " ");
-                strcat(lineNew, p);
-            }
-            strcpy(line, lineNew);
-
-            p = strstr(line, "h=");
-            if (p != 0)
-            {
-                float value = OpFloat(line, "h", 32.0f);
-                value /= g_unit;
-                p[0] = 0;
-                p = SkipNum(p+2);
-                strcpy(lineNew, line);
-                strcat(lineNew, "h=");
-                sprintf(s, "%.2f", value);
-                strcat(lineNew, s);
-                strcat(lineNew, " ");
-                strcat(lineNew, p);
-            }
-            strcpy(line, lineNew);
-        }
-
-        fputs(lineNew, fileNew);
-    }
-
-    fclose(fileNew);
-    fclose(file);
-}
-
 //! Load the scene for the character
 void CRobotMain::ScenePerso()
 {