comparison UI/UIBooks.cpp @ 1590:5792fdafe2f5

Слияние
author Ritor1
date Wed, 11 Sep 2013 09:39:09 +0600
parents 75fafd8ced59
children d28d3c006077
comparison
equal deleted inserted replaced
1589:f408fbf3d9cc 1590:5792fdafe2f5
7 #include "..\Render.h" 7 #include "..\Render.h"
8 #include "..\GUIWindow.h" 8 #include "..\GUIWindow.h"
9 #include "..\GUIFont.h" 9 #include "..\GUIFont.h"
10 #include "..\AudioPlayer.h" 10 #include "..\AudioPlayer.h"
11 #include "..\LOD.h" 11 #include "..\LOD.h"
12 #include "..\Allocator.h" 12
13 #include "..\mm7_data.h" 13 #include "..\mm7_data.h"
14 14
15 //----- (00413CC6) -------------------------------------------------------- 15 //----- (00413CC6) --------------------------------------------------------
16 void BookUI_Draw(WindowType book) 16 void BookUI_Draw(WindowType book)
17 { 17 {
88 if ( pGUIWindow_CurrentMenu->pControlsHead ) 88 if ( pGUIWindow_CurrentMenu->pControlsHead )
89 { 89 {
90 do 90 do
91 { 91 {
92 pNextButton = pGUIWindow_CurrentMenu->pControlsHead->pNext; 92 pNextButton = pGUIWindow_CurrentMenu->pControlsHead->pNext;
93 pAllocator->FreeChunk(pGUIWindow_CurrentMenu->pControlsHead); 93 free(pGUIWindow_CurrentMenu->pControlsHead);
94 pGUIWindow_CurrentMenu->pControlsHead = pNextButton; 94 pGUIWindow_CurrentMenu->pControlsHead = pNextButton;
95 } 95 }
96 while ( pNextButton ); 96 while ( pNextButton );
97 } 97 }
98 pGUIWindow_CurrentMenu->pControlsHead = 0; 98 pGUIWindow_CurrentMenu->pControlsHead = 0;