Mercurial > mm7

comparison UI/UICharacter.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 9f8b3e904e14
children 61ea994a1812
comparison
equal deleted inserted replaced
1577:1b6217e07b26 1583:75fafd8ced59
17 #include "..\Viewport.h" 17 #include "..\Viewport.h"
18 #include "..\Time.h" 18 #include "..\Time.h"
19 #include "..\Awards.h" 19 #include "..\Awards.h"
20 #include "..\CastSpellInfo.h" 20 #include "..\CastSpellInfo.h"
21 #include "..\texts.h" 21 #include "..\texts.h"
22 #include "..\Mouse.h"
23
22 #include "..\mm7_data.h" 24 #include "..\mm7_data.h"
23 #include "..\Mouse.h"
24 #include "..\Allocator.h"
25
26 25
27 int bRingsShownInCharScreen; // 5118E0 26 int bRingsShownInCharScreen; // 5118E0
28 27
29 unsigned int ui_mainmenu_copyright_color; 28 unsigned int ui_mainmenu_copyright_color;
30 29
2734 { 2733 {
2735 j = i->pNext; 2734 j = i->pNext;
2736 if ( BYTE1(i->field_1C) & 0x80 ) 2735 if ( BYTE1(i->field_1C) & 0x80 )
2737 { 2736 {
2738 i->Release(); 2737 i->Release();
2739 pAllocator->FreeChunk(i); 2738 free(i);
2740 } 2739 }
2741 } 2740 }
2742 for ( j = pGUIWindow_CurrentMenu->pControlsHead; j; j = j->pNext ) 2741 for ( j = pGUIWindow_CurrentMenu->pControlsHead; j; j = j->pNext )
2743 { 2742 {
2744 if ( j->msg == UIMSG_InventoryLeftClick) 2743 if ( j->msg == UIMSG_InventoryLeftClick)