Mercurial > mm7

diff IconFrameTable.cpp @ 1607:d4282f59f312

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Слияние
author Ritor1
date Wed, 11 Sep 2013 00:16:58 +0600
parents 75fafd8ced59
children c1c74df0a33e
line wrap: on
line diff
--- a/IconFrameTable.cpp	Wed Sep 11 00:16:49 2013 +0600
+++ b/IconFrameTable.cpp	Wed Sep 11 00:16:58 2013 +0600
@@ -1,7 +1,6 @@
 #include "IconFrameTable.h"
 #include "LOD.h"
 #include "mm7_data.h"
-#include "Allocator.h"
 #include "FrameTableInc.h"
 
 //----- (00494F3A) --------------------------------------------------------
@@ -122,7 +121,7 @@
   Assert(uNumIcons);
   Assert(!num_mm8_frames);
 
-  pIcons = (IconFrame *)pAllocator->AllocNamedChunk(pIcons, uNumIcons * sizeof(IconFrame), "I Frames");
+  pIcons = (IconFrame *)malloc(uNumIcons * sizeof(IconFrame));
   memcpy(pIcons,                                   (char *)data_mm7 + 4, num_mm7_frames * sizeof(IconFrame));
   memcpy(pIcons + num_mm7_frames,                  (char *)data_mm6 + 4, num_mm6_frames * sizeof(IconFrame));
   memcpy(pIcons + num_mm6_frames + num_mm7_frames, (char *)data_mm8 + 4, num_mm8_frames * sizeof(IconFrame));
@@ -182,7 +181,7 @@
     v4 = v21;
   }
   v2->uNumIcons = v4;
-  v5 = pAllocator->AllocNamedChunk(v2->pIcons, 32 * v4, "I Frames");
+  v5 = malloc(32 * v4);//, "I Frames");
   v2->pIcons = (IconFrame *)v5;
   if ( v5 )
   {