Mercurial > mm7
comparison GUIWindow.cpp @ 962:0423c40d7e88
UpdateWindows and pWindow->Release
author | Ritor1 |
---|---|
date | Tue, 07 May 2013 17:32:23 +0600 |
parents | 5a12082c803d |
children | c8a0f6d89c70 |
comparison
equal
deleted
inserted
replaced
961:5a12082c803d | 962:0423c40d7e88 |
---|---|
402 this->eWindowType = WINDOW_null; | 402 this->eWindowType = WINDOW_null; |
403 while ( this->numVisibleWindows < uNumVisibleWindows ) | 403 while ( this->numVisibleWindows < uNumVisibleWindows ) |
404 { | 404 { |
405 v12 = pVisibleWindowsIdxs[this->numVisibleWindows + 1]; | 405 v12 = pVisibleWindowsIdxs[this->numVisibleWindows + 1]; |
406 pVisibleWindowsIdxs[this->numVisibleWindows] = v12; | 406 pVisibleWindowsIdxs[this->numVisibleWindows] = v12; |
407 --*((int *)&pTexture_PCX.field_18 + 21 * v12); | 407 --pWindowList[v12 - 1].numVisibleWindows; |
408 ++this->numVisibleWindows; | 408 ++this->numVisibleWindows; |
409 } | 409 } |
410 pVisibleWindowsIdxs[uNumVisibleWindows] = 0; | 410 pVisibleWindowsIdxs[uNumVisibleWindows] = 0; |
411 uNumVisibleWindows = uNumVisibleWindows - 1; | 411 uNumVisibleWindows = uNumVisibleWindows - 1; |
412 } | 412 } |
1718 GUIWindow *GUIWindow::Create(unsigned int uX, unsigned int uY, unsigned int uWidth, unsigned int uHeight, WindowType eWindowType, int pButton, int a5) | 1718 GUIWindow *GUIWindow::Create(unsigned int uX, unsigned int uY, unsigned int uWidth, unsigned int uHeight, WindowType eWindowType, int pButton, int a5) |
1719 { | 1719 { |
1720 unsigned int uNextFreeWindowID; // ebp@1 | 1720 unsigned int uNextFreeWindowID; // ebp@1 |
1721 //int *v8; // eax@1 | 1721 //int *v8; // eax@1 |
1722 //GUIWindow *pWindow; // esi@4 | 1722 //GUIWindow *pWindow; // esi@4 |
1723 int v10; // eax@4 | 1723 //int v10; // eax@4 |
1724 unsigned int v11; // ebx@15 | 1724 unsigned int v11; // ebx@15 |
1725 NPCData *speakingNPC; // ebp@15 | 1725 NPCData *speakingNPC; // ebp@15 |
1726 int v14; // eax@20 | 1726 int v14; // eax@20 |
1727 int v16; // eax@25 | 1727 int v16; // eax@25 |
1728 int v18; // eax@30 | 1728 int v18; // eax@30 |
1747 pWindow->uFrameWidth = uWidth; | 1747 pWindow->uFrameWidth = uWidth; |
1748 pWindow->uFrameZ = uX + uWidth - 1; | 1748 pWindow->uFrameZ = uX + uWidth - 1; |
1749 pWindow->uFrameW = uY + uHeight - 1; | 1749 pWindow->uFrameW = uY + uHeight - 1; |
1750 pWindow->ptr_1C = (void *)pButton; | 1750 pWindow->ptr_1C = (void *)pButton; |
1751 pWindow->Hint = (char *)a5; | 1751 pWindow->Hint = (char *)a5; |
1752 v10 = uNumVisibleWindows; | 1752 //v10 = uNumVisibleWindows; |
1753 pWindow->uFrameX = uX; | 1753 pWindow->uFrameX = uX; |
1754 ++v10; | 1754 //++v10; |
1755 pWindow->uFrameY = uY; | 1755 pWindow->uFrameY = uY; |
1756 pWindow->uFrameHeight = uHeight; | 1756 pWindow->uFrameHeight = uHeight; |
1757 pWindow->eWindowType = eWindowType; | 1757 pWindow->eWindowType = eWindowType; |
1758 pWindow->field_44 = 0; | 1758 pWindow->field_44 = 0; |
1759 ++uNumVisibleWindows; | 1759 ++uNumVisibleWindows; |