Merged revisions 32879,32883,32895,32899,32902-32904,32910-32912,32923-32924,32930-32931,32938,32940,32948-32949,32951,32960-32964,32966-32970,32972-32974,32976,32978,32983,32986-32990,32992,32994,33002-33004,33006-33007,33009-33010,33014,33017,33021-33023,33030,33033,33052-33053,33056-33058,33061-33064,33068,33070,33072,33075,33078-33079,33083,33086-33087,33089,33094-33096,33098-33099,33104,33108-33109,33114-33117,33120,33135-33146,33160,33162,33165,33167-33169 via svnmerge from

https://scummvm.svn.sourceforge.net/svnroot/scummvm/scummvm/trunk

svn-id: r33185

1 files changed, 15 insertions, 11 deletions

diff --git a/engines/gob/mult_v2.cpp b/engines/gob/mult_v2.cpp
index 3a83ac1867..20a81174e5 100644
--- a/engines/gob/mult_v2.cpp
+++ b/engines/gob/mult_v2.cpp
@@ -329,8 +329,8 @@ void Mult_v2::freeMultKeys() {
 	if (_animDataAllocated) {
 		freeMult();
 
-		delete[] _animArrayX;
-		delete[] _animArrayY;
+		delete _animArrayX;
+		delete _animArrayY;
 		delete[] _animArrayData;
 
 		_animArrayX = 0;
@@ -510,6 +510,13 @@ void Mult_v2::playMultInit() {
 	if (!_animSurf) {
 		int16 width, height;
 
+		for (int i = 0; i < _objCount; i++) {
+			delete _objects[i].pPosX;
+			delete _objects[i].pPosY;
+		}
+
+		delete[] _objects;
+	
 		_vm->_util->setFrameRate(_multData->frameRate);
 		_animTop = 0;
 		_animLeft = 0;
@@ -517,33 +524,30 @@ void Mult_v2::playMultInit() {
 		_animHeight = _vm->_video->_surfHeight;
 		_objCount = 4;
 
-		delete[] _objects;
 		delete[] _orderArray;
 		delete[] _renderObjs;
-		delete[] _animArrayX;
-		delete[] _animArrayY;
+		delete _animArrayX;
+		delete _animArrayY;
 		delete[] _animArrayData;
 
 		_objects = new Mult_Object[_objCount];
 		_orderArray = new int8[_objCount];
 		_renderObjs = new Mult_Object*[_objCount];
-		_animArrayX = new int32[_objCount];
-		_animArrayY = new int32[_objCount];
+		_animArrayX = new VariablesLE(_objCount * 4);
+		_animArrayY = new VariablesLE(_objCount * 4);
 		_animArrayData = new Mult_AnimData[_objCount];
 
 		memset(_objects, 0, _objCount * sizeof(Mult_Object));
 		memset(_orderArray, 0, _objCount * sizeof(int8));
 		memset(_renderObjs, 0, _objCount * sizeof(Mult_Object *));
-		memset(_animArrayX, 0, _objCount * sizeof(int32));
-		memset(_animArrayY, 0, _objCount * sizeof(int32));
 		memset(_animArrayData, 0, _objCount * sizeof(Mult_AnimData));
 
 		for (_counter = 0; _counter < _objCount; _counter++) {
 			Mult_Object &multObj = _objects[_counter];
 			Mult_AnimData &animData = _animArrayData[_counter];
 
-			multObj.pPosX = (int32 *) &_animArrayX[_counter];
-			multObj.pPosY = (int32 *) &_animArrayY[_counter];
+			multObj.pPosX = new VariableReference(*_animArrayX, _counter * 4);
+			multObj.pPosY = new VariableReference(*_animArrayY, _counter * 4);
 			multObj.pAnimData = &animData;
 
 			animData.isStatic = 1;