Mercurial > mm7

comparison GUIWindow.cpp @ 1583:75fafd8ced59

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Allocator (CMemory) bye-bye
author Nomad
date Tue, 10 Sep 2013 21:07:07 +0200
parents ab6bf38b2940
children 5792fdafe2f5
comparison
equal deleted inserted replaced
1577:1b6217e07b26 1583:75fafd8ced59
8 #include "LOD.h" 8 #include "LOD.h"
9 #include "Keyboard.h" 9 #include "Keyboard.h"
10 #include "IndoorCamera.h" 10 #include "IndoorCamera.h"
11 #include "Math.h" 11 #include "Math.h"
12 #include "VideoPlayer.h" 12 #include "VideoPlayer.h"
13 #include "Allocator.h"
14 #include "MapInfo.h" 13 #include "MapInfo.h"
15 #include "Time.h" 14 #include "Time.h"
16 #include "AudioPlayer.h" 15 #include "AudioPlayer.h"
17 #include "Mouse.h" 16 #include "Mouse.h"
18 #include "Viewport.h" 17 #include "Viewport.h"
351 if ( this->pControlsHead ) 350 if ( this->pControlsHead )
352 { 351 {
353 do 352 do
354 { 353 {
355 pNextBtn = this->pControlsHead->pNext; 354 pNextBtn = this->pControlsHead->pNext;
356 pAllocator->FreeChunk(this->pControlsHead); 355 free(this->pControlsHead);
357 this->pControlsHead = pNextBtn; 356 this->pControlsHead = pNextBtn;
358 } 357 }
359 while ( pNextBtn ); 358 while ( pNextBtn );
360 } 359 }
361 this->pControlsHead = 0; 360 this->pControlsHead = 0;
1494 Texture **v19; // ecx@5 1493 Texture **v19; // ecx@5
1495 Texture **v20; // edx@5 1494 Texture **v20; // edx@5
1496 GUIButton *v21; // eax@7 1495 GUIButton *v21; // eax@7
1497 va_list texturs_ptr; 1496 va_list texturs_ptr;
1498 1497
1499 pButton = (GUIButton *)pAllocator->AllocNamedChunk(0, 0xBCu, "BUTTON"); 1498 pButton = (GUIButton *)malloc(0xBC);
1500 pButton->pParent = this; 1499 pButton->pParent = this;
1501 pButton->uWidth = uWidth; 1500 pButton->uWidth = uWidth;
1502 pButton->uHeight = uHeight; 1501 pButton->uHeight = uHeight;
1503 1502
1504 if ( a6 == 2 && !uHeight ) 1503 if ( a6 == 2 && !uHeight )