mm7: Render.cpp comparison

comparison Render.cpp @ 1583:75fafd8ced59

Allocator (CMemory) bye-bye

author	Nomad
date	Tue, 10 Sep 2013 21:07:07 +0200
parents	2d9c8f609a3c
children	cff02d7d3460

comparison

equal deleted inserted replaced

-:1b6217e07b26
+:75fafd8ced59
 #include "Game.h"
 #include "LightmapBuilder.h"
 #include "ObjectList.h"
 #include "SpriteObject.h"
 #include "DecorationList.h"
-#include "Allocator.h"
 #include "OSInfo.h"
 #include "Actor.h"
 #include "Log.h"
 #include "TileFrameTable.h"
 #include "texts.h"
 Render::~Render()
 {
 Render *v1; // esi@1
 v1 = this;
-pAllocator->FreeChunk(this->pDefaultZBuffer);
+free(this->pDefaultZBuffer);
 v1->pD3DBitmaps.Release();
 v1->pD3DSprites.Release();
 Release();
 v1->bWindowMode = 1;
 //nullsub_1();
 fwrite(&header2, 1u, 1u, v6);
 fwrite(&header2.planes, 1u, 1u, v6);
 fwrite(&header2.pitch, 2u, 1u, v6);
 fwrite(&header2.palette_info, 2u, 1u, v6);
 fwrite(v15, 0x3Au, 1u, v6);
-ptr = pAllocator->AllocNamedChunk(0, 3 * var38 + 6, 0);
+ptr = malloc(3 * var38 + 6);
 if ( v29 > 0 )
 {
 v7 = v30;
 File = (FILE *)v29;
 v29 = 3 * v30;
 else
 {
 pRenderer->EndScene();
 }
-pAllocator->FreeChunk(ptr);
+free(ptr);
 fclose(v6);
 }
 }
 }
 // 4EFA80: using guessed type int dword_4EFA80;
 fwrite(&v37, 1u, 1u, v7);
 fwrite(&v38, 1u, 1u, v7);
 fwrite(&v39, 2u, 1u, v7);
 fwrite(&v40, 2u, 1u, v7);
 fwrite(&v16, 0x3Au, 1u, v7);
-ptr = pAllocator->AllocNamedChunk(0, 3 * v25 + 6, 0);
+ptr = malloc(3 * v25 + 6);
 if ( (signed int)a1 > 0 )
 {
 v8 = v43;
 File = (FILE *)a1;
 v24 = 3 * v43;
 }
 else
 {
 pRenderer->EndScene();
 }
-pAllocator->FreeChunk(ptr);
+free(ptr);
 fclose(v7);
 }
 }
 }
 // 4EFA84: using guessed type int dword_4EFA84;
 memcpy(v8, &v27.palette_info, 2u);
 v8 = (char *)v8 + 2;
 memcpy(v8, &v18, 0x3Au);
 v9 = (char *)v8 + 58;
-lineRGB = (char*)pAllocator->AllocNamedChunk(0, 3 * (wight + 2), 0);
+lineRGB = (char*)malloc(3 * (wight + 2));
 if ( heidth > 0 )
 {
 v10 = pitch;
 v25 = heidth;
 v26 = 3 * pitch;
 if ( v16 )
 break;
 v10 = pitch;
 }
 }
-pAllocator->FreeChunk(lineRGB);
+free(lineRGB);
 *(int *)packed_size = (char *)v9 - data_buff;
 }
 //----- (0049F8B5) --------------------------------------------------------
 fwrite(&header2, 1u, 1u, v7);
 fwrite(&header2.planes, 1u, 1u, v7);
 fwrite(&header2.pitch, 2u, 1u, v7);
 fwrite(&header2.palette_info, 2u, 1u, v7);
 fwrite(v14, 0x3Au, 1u, v7);
-ptr = pAllocator->AllocNamedChunk(0, 3 * a4 + 6, 0);
+ptr = malloc(3 * a4 + 6);
 if ( a5 > 0 )
 {
 v8 = v24;
 v18 = a5;
 v20 = 3 * v24;
 if ( v13 )
 break;
 v8 = v24;
 }
 }
-pAllocator->FreeChunk(ptr);
+free(ptr);
 result = (FILE *)fclose(v7);
 }
 return result;
 }
 void Render::CreateZBuffer()
 {
 if (!pDefaultZBuffer)
 {
 pDefaultZBuffer = pActiveZBuffer = nullptr;
-pDefaultZBuffer = pActiveZBuffer = (int *)pAllocator->AllocNamedChunk(0, 0x12C000, "Z Buf.");
+pDefaultZBuffer = pActiveZBuffer = (int *)malloc(0x12C000);
 memset32(pActiveZBuffer, 0xFFFF0000, 0x4B000u); //    // inlined Render::ClearActiveZBuffer  (mm8::004A085B)
 }
 }
 //----- (0049FE05) --------------------------------------------------------
 {
 pBeforePresentFunction = 0;//nullsub_1;
 }
 bWindowMode = 0;
 pParty->uFlags |= 2u;
-LODWORD(flt_6BE3A0) = 0x3F0CCCCDu;
+LODWORD(flt_6BE3A0) = 0x3F0CCCCDu;  __debugbreak(); // replace with actual float
 pViewport->_4C02F8(36044);
 return v15 != 0;
 }
-// 6BE3A0: using guessed type float flt_6BE3A0;
 //----- (004A05F3) --------------------------------------------------------
 bool Render::SwitchToWindow(HWND hWnd)
 {
 //Render *v2; // esi@1
 //----- (004524D8) --------------------------------------------------------
 HWLTexture *RenderHWLContainer::LoadTexture(const char *pName, int bMipMaps)
 {
-int v11; // eax@13
+//int v11; // eax@13
-int v12; // ecx@13
+//int v12; // ecx@13
 void *v13; // eax@13
-unsigned __int8 v14; // zf@13
+//unsigned __int8 v14; // zf@13
-unsigned __int8 v15; // sf@13
+//unsigned __int8 v15; // sf@13
 int v16; // esi@14
 int v17; // ecx@16
 int v18; // esi@16
 unsigned __int16 *v19; // eax@16
 int v20; // edx@16
 delete [] pCompressedData;
 }
 else
 fread(pTex->pPixels, 2, pTex->uWidth * pTex->uHeight, pFile);
-if ( field_61A94_scale_hwls_to_half )     //is it even possible to ever get here? field_61A94_scale_hwls_to_half is only set to zero
+if ( scale_hwls_to_half )
 {
-v11 = pTex->uHeight / 2;
+pTex->uHeight /= 2;
-v12 = pTex->uWidth / 2;
+pTex->uWidth /= 2;
-pTex->uHeight = v11;
+v13 = new unsigned __int16[pTex->uWidth * pTex->uHeight];
-pTex->uWidth = v12;
-v13 = new unsigned __int16[v12 * v11];
 v28 = 0;
-v14 = pTex->uHeight == 0;
-v15 = (pTex->uHeight & 0x80000000u) != 0;
 v26 = (unsigned __int16 *)v13;
-if ( !(v15 | v14) )
+if ( pTex->uHeight > 0 )
 {
 v16 = pTex->uWidth;
 v27 = 1;
 do
 {
 v21 = (int)&v19[2 * (pDestb + v17)];
 v22 = (int)&v19[2 * v20];
 LOWORD(v20) = *(unsigned short *)(v21 + 2);
 LOWORD(v21) = *(unsigned short *)v21;
 v23 = pDestb++ + v18;
-v26[v23] = sub_452442(*(unsigned short *)v22, *(unsigned short *)(v22 + 2), v21, v20);
+extern unsigned int __fastcall _452442_color_cvt(unsigned __int16 a1, unsigned __int16 a2, int a3, int a4);
+v26[v23] = _452442_color_cvt(*(unsigned short *)v22, *(unsigned short *)(v22 + 2), v21, v20);
 v16 = pTex->uWidth;
 }
 while (pDestb < pTex->uWidth);
 }
 ++v28;
 }
 delete [] pTex->pPixels;
 pTex->pPixels = v26;
 }
 return pTex;
-//result = pTex;
-//  }
-//  else
-//  {
-//LABEL_8:
-//    return nullptr;
-//  }
 }
 //----- (0045271F) --------------------------------------------------------
 bool RenderHWLContainer::Release()
 {
 this->pFile = 0;
 uSignature = 0;
 this->uDataOffset = 0;
 memset(&this->uNumItems, 0, 0x61A84u);
 this->uNumItems = 0;
-this->field_61A94_scale_hwls_to_half = 0;
+this->scale_hwls_to_half = false;
 }
 //----- (0045237F) --------------------------------------------------------
 bool RenderHWLContainer::Load(const wchar_t *pFilename)
 {

Mercurial > mm7

comparison Render.cpp @ 1583:75fafd8ced59