diff LOD.cpp @ 1635:04cae215a13c

Слияние
author Ritor1
date Tue, 17 Sep 2013 16:30:43 +0600
parents 8094f1706b1f
children 780dd567f1da
line wrap: on
line diff
--- a/LOD.cpp	Tue Sep 17 16:30:36 2013 +0600
+++ b/LOD.cpp	Tue Sep 17 16:30:43 2013 +0600
@@ -2151,10 +2151,10 @@
   v5->pLevelOfDetail0_prolly_alpha_mask = 0;
   if ( v6 )
   {
-    v7 = operator new(v6);
+    v7 = malloc(v6);
     v8 = v5->uTextureSize;
     v5->pLevelOfDetail0_prolly_alpha_mask = (unsigned __int8 *)v7;
-    pContainer = (const char *)operator new(v8);
+    pContainer = (const char *)malloc(v8);
     fread((void *)pContainer, 1u, (size_t)pDst, File);
     zlib::MemUnzip(v5->pLevelOfDetail0_prolly_alpha_mask, &v5->uDecompressedSize, pContainer, v5->uTextureSize);
     v9 = (void *)pContainer;
@@ -2163,7 +2163,7 @@
   }
   else
   {
-    v10 = (unsigned __int8 *)operator new(0);
+    v10 = (unsigned __int8 *)malloc(0);
     v11 = File;
     v5->pLevelOfDetail0_prolly_alpha_mask = v10;
     fread(v10, 1u, (size_t)pDst, v11);
@@ -2171,7 +2171,7 @@
   v5->pPalette24 = 0;
   if ( uTextureType == 1 )
   {
-    v12 = operator new(0x300u);
+    v12 = malloc(0x300u);
     v13 = File;
     v5->pPalette24 = (unsigned __int8 *)v12;
     fread(v12, 1u, 0x300u, v13);
@@ -2183,7 +2183,7 @@
     goto LABEL_10;
   v18 = 0;
   v5->pPalette16 = 0;
-  v5->pPalette16 = (unsigned __int16 *)operator new(0x400u);
+  v5->pPalette16 = (unsigned __int16 *)malloc(0x400u);
   do
   {
     fread((char *)&pContainer + 3, 1u, 1u, File);
@@ -2343,7 +2343,7 @@
         else
         {
           v4 = strlen(v3 - 2);
-          v5 = (char *)operator new(v4 + 2);
+          v5 = (char *)malloc(v4 + 2);
           *v5 = 'h';
           strcpy(v5 + 1, v3 - 2);
           pRenderer->LoadTexture(
@@ -2610,7 +2610,7 @@
     else
     {
       v11 = strlen(pContainer);
-      v12 = (enum TEXTURE_TYPE)(int)operator new(v11 + 2);
+      v12 = (enum TEXTURE_TYPE)(int)malloc(v11 + 2);
       eTextureType = v12;
       *(char *)v12 = 104;
       strcpy((char *)(v12 + 1), pContainer);