summaryrefslogtreecommitdiffstats
path: root/src/object/task
diff options
context:
space:
mode:
authorPiotr Dziwinski <piotrdz@gmail.com>2012-12-29 15:01:57 +0100
committerPiotr Dziwinski <piotrdz@gmail.com>2012-12-29 15:01:57 +0100
commita134cb75c5dd2570b9aeb1530701086d4f3f593d (patch)
treed5b1b158fb0d53b612b860013102126394ff6cc2 /src/object/task
parentcf65681f8029c2c1e5f18cc3776bdb09c8bd1db0 (diff)
downloadcolobot-a134cb75c5dd2570b9aeb1530701086d4f3f593d.tar.gz
colobot-a134cb75c5dd2570b9aeb1530701086d4f3f593d.tar.bz2
colobot-a134cb75c5dd2570b9aeb1530701086d4f3f593d.zip
Merge of master and dev
Diffstat (limited to 'src/object/task')
-rw-r--r--src/object/task/taskgoto.cpp4
1 files changed, 2 insertions, 2 deletions
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;
}