Ticket #2644: itemsheap.diff

engines/simon/simon.cpp

@@ -97 +97 @@
         _itemArraySize = 0;
         _itemArrayInited = 0;
 
-        _itemHeapPtr = 0;
-        _itemHeapCurPos = 0;
-        _itemHeapSize = 0;
-
         _iconFilePtr = 0;
 
         _tblList = 0;
@@ -588 +584 @@
 
         midi.close();
 
-        free(_itemHeapPtr - _itemHeapCurPos);
+        for (uint i = 0; i < _itemHeap.size(); i++) {
+                delete [] _itemHeap[i];
+        }
+
+        _itemHeap.clear();
+
         free(_tablesHeapPtr - _tablesHeapCurPos);
 
         free(_gameOffsetsPtr);
@@ -654 +655 @@
 }
 
 byte *SimonEngine::allocateItem(uint size) {
-        byte *org = _itemHeapPtr;
-        size = (size + 3) & ~3;
+        byte *item = new byte[size];
 
-        _itemHeapPtr += size;
-        _itemHeapCurPos += size;
-
-        if (_itemHeapCurPos > _itemHeapSize)
-                error("Itemheap overflow");
-
-        return org;
+        memset(item, 0, size);
+        _itemHeap.push_back(item);
+        return item;
 }
 
 void SimonEngine::setUserFlag(Item *item, int a, int b) {
@@ -728 +724 @@
 }
 
 void SimonEngine::allocItemHeap() {
-        _itemHeapSize = 10000;
-        _itemHeapCurPos = 0;
-        _itemHeapPtr = (byte *)calloc(10000, 1);
+        _itemHeap.clear();
 }
 
 void SimonEngine::allocTablesHeap() {
@@ -1961 +1955 @@
 
         free(_stringTabPtr);
         free(_itemArrayPtr);
-        free(_itemHeapPtr - _itemHeapCurPos);
-        free(_tablesHeapPtr - _tablesHeapCurPos);
+
+        for (uint i = 0; i < _itemHeap.size(); i++) {
+                delete [] _itemHeap[i];
+        }
+
+        _itemHeap.clear();
+
         free(_tblList);
         free(_zoneBuffers);
         free(_iconFilePtr);

engines/simon/simon.h

@@ -26 +26 @@
 
 #include "base/engine.h"
 
+#include "common/array.h"
 #include "common/rect.h"
 #include "common/util.h"
 
@@ -210 +211 @@
         uint _itemArraySize;
         uint _itemArrayInited;
 
-        byte *_itemHeapPtr;
-        uint _itemHeapCurPos;
-        uint _itemHeapSize;
+        Common::Array<byte *> _itemHeap;
 
         byte *_iconFilePtr;