From a134cb75c5dd2570b9aeb1530701086d4f3f593d Mon Sep 17 00:00:00 2001
From: Piotr Dziwinski <piotrdz@gmail.com>
Date: Sat, 29 Dec 2012 15:01:57 +0100
Subject: Merge of master and dev

---
 src/object/brain.cpp         | 27 ++++++++++++++++++---------
 src/object/robotmain.cpp     |  8 ++++----
 src/object/task/taskgoto.cpp |  4 ++--
 3 files changed, 24 insertions(+), 15 deletions(-)

(limited to 'src/object')

diff --git a/src/object/brain.cpp b/src/object/brain.cpp
index 4ce1bf8..ef7309d 100644
--- a/src/object/brain.cpp
+++ b/src/object/brain.cpp
@@ -99,7 +99,7 @@ CBrain::CBrain(CInstanceManager* iMan, CObject* object)
     m_selScript = 0;
 
     m_bTraceRecord = false;
-    m_traceRecordBuffer = 0;
+    m_traceRecordBuffer = nullptr;
 }
 
 // Object's destructor.
@@ -111,12 +111,21 @@ CBrain::~CBrain()
     for ( i=0 ; i<BRAINMAXSCRIPT ; i++ )
     {
         delete m_script[i];
+        m_script[i] = nullptr;
     }
 
     delete m_primaryTask;
+    m_primaryTask = nullptr;
+
     delete m_secondaryTask;
+    m_secondaryTask = nullptr;
+
     delete m_studio;
-    delete m_traceRecordBuffer;
+    m_studio = nullptr;
+
+    delete[] m_traceRecordBuffer;
+    m_traceRecordBuffer = nullptr;
+
     m_iMan->DeleteInstance(CLASS_BRAIN, this);
 }
 
@@ -2791,8 +2800,8 @@ void CBrain::TraceRecordStart()
         m_traceColor = -1;
     }
 
-    delete m_traceRecordBuffer;
-    m_traceRecordBuffer = static_cast<TraceRecord*>(malloc(sizeof(TraceRecord)*MAXTRACERECORD));
+    delete[] m_traceRecordBuffer;
+    m_traceRecordBuffer = new TraceRecord[MAXTRACERECORD];
     m_traceRecordIndex = 0;
 }
 
@@ -2858,10 +2867,10 @@ void CBrain::TraceRecordStop()
     int         max, i;
     char*       buffer;
 
-    if ( m_traceRecordBuffer == 0 )  return;
+    if ( m_traceRecordBuffer == nullptr )  return;
 
     max = 10000;
-    buffer = static_cast<char*>(malloc(max));
+    buffer = new char[max];
     *buffer = 0;
     strncat(buffer, "extern void object::AutoDraw()\n{\n", max-1);
 
@@ -2892,8 +2901,8 @@ void CBrain::TraceRecordStop()
     }
     TraceRecordPut(buffer, max, lastOper, lastParam);
 
-    delete m_traceRecordBuffer;
-    m_traceRecordBuffer = 0;
+    delete[] m_traceRecordBuffer;
+    m_traceRecordBuffer = nullptr;
 
     strncat(buffer, "}\n", max-1);
     buffer[max-1] = 0;
@@ -2904,7 +2913,7 @@ void CBrain::TraceRecordStop()
         m_script[i] = new CScript(m_iMan, m_object, &m_secondaryTask);
     }
     m_script[i]->SendScript(buffer);
-    delete buffer;
+    delete[] buffer;
 }
 
 // Saves an instruction CBOT.
diff --git a/src/object/robotmain.cpp b/src/object/robotmain.cpp
index d5805d0..aa2fe22 100644
--- a/src/object/robotmain.cpp
+++ b/src/object/robotmain.cpp
@@ -3808,16 +3808,16 @@ void CRobotMain::CreateScene(bool soluce, bool fixScene, bool resetObject)
             }
         }
 
-        // TODO: language letters
-        sprintf(op, "Title.%c", 'E' /*GetLanguageLetter()*/);
+        // TODO: Fallback to an non-localized entry
+        sprintf(op, "Title.%c", m_app->GetLanguageChar());
         if (Cmd(line, op) && !resetObject)
             OpString(line, "text", m_title);
 
-        sprintf(op, "Resume.%c", 'E' /*GetLanguageLetter()*/);
+        sprintf(op, "Resume.%c", m_app->GetLanguageChar());
         if (Cmd(line, op) && !resetObject)
             OpString(line, "text", m_resume);
 
-        sprintf(op, "ScriptName.%c", 'E' /*GetLanguageLetter()*/);
+        sprintf(op, "ScriptName.%c", m_app->GetLanguageChar());
         if (Cmd(line, op) && !resetObject)
             OpString(line, "text", m_scriptName);
 
diff --git a/src/object/task/taskgoto.cpp b/src/object/task/taskgoto.cpp
index ce778ef..cab57f1 100644
--- a/src/object/task/taskgoto.cpp
+++ b/src/object/task/taskgoto.cpp
@@ -2119,7 +2119,7 @@ bool CTaskGoto::BitmapOpen()
     BitmapClose();
 
     m_bmSize = static_cast<int>(3200.0f/BM_DIM_STEP);
-    m_bmArray = static_cast<unsigned char*>(malloc(m_bmSize*m_bmSize/8*2));
+    m_bmArray = new unsigned char[m_bmSize*m_bmSize/8*2];
     memset(m_bmArray, 0, m_bmSize*m_bmSize/8*2);
 
     m_bmOffset = m_bmSize/2;
@@ -2137,7 +2137,7 @@ bool CTaskGoto::BitmapOpen()
 
 bool CTaskGoto::BitmapClose()
 {
-    free(m_bmArray);
+    delete[] m_bmArray;
     m_bmArray = 0;
     return true;
 }
-- 
cgit v1.2.3-1-g7c22