# HG changeset patch # User Ritor1 # Date 1384096409 -21600 # Node ID 37f42cfc881d9546f9c1abe510c4475aa179e97b # Parent 591024ad7269a2cd070a28ffea5ebb587143ebf9 m diff -r 591024ad7269 -r 37f42cfc881d Build/Visual Studio 2012/World of Might and Magic.v11.suo Binary file Build/Visual Studio 2012/World of Might and Magic.v11.suo has changed diff -r 591024ad7269 -r 37f42cfc881d Chest.cpp --- a/Chest.cpp Sat Nov 09 00:15:18 2013 +0600 +++ b/Chest.cpp Sun Nov 10 21:13:29 2013 +0600 @@ -199,17 +199,17 @@ //----- (0042038D) -------------------------------------------------------- void ChestUI_WritePointedObjectStatusString() { - POINT *v0; // esi@2 + //POINT *v0; // esi@2 int v1; // ecx@2 - const char *v2; // eax@3 - POINT v3; // [sp+0h] [bp-10h]@2 - POINT a2; // [sp+8h] [bp-8h]@1 + //const char *v2; // eax@3 + //POINT v3; // [sp+0h] [bp-10h]@2 + POINT cursor; // [sp+8h] [bp-8h]@1 __debugbreak(); // invalid indexing - if ( pMouse->GetCursorPos(&a2)->y < 350 ) + pMouse->GetCursorPos(&cursor); + if ( cursor.y < 350 ) { - v0 = pMouse->GetCursorPos(&a2); - v1 = pRenderer->pActiveZBuffer[v0->x + pSRZBufferLineOffsets[pMouse->GetCursorPos(&v3)->y]]; + v1 = pRenderer->pActiveZBuffer[cursor.x + pSRZBufferLineOffsets[cursor.y]]; if ( v1 ) { ItemGen* _w = (ItemGen *)(&pOtherOverlayList->pOverlays[49].field_4 + 2662 * (unsigned int)pChestWindow->ptr_1C @@ -218,8 +218,8 @@ _w = (ItemGen *)(&pChests[(unsigned int)pChestWindow->ptr_1C] -32 + 18 * *((short *)&pChests[(unsigned int)pChestWindow->ptr_1C].igChestItems[139].uExpireTime + v1 + 3)); - v2 = _w->GetDisplayName(); - GameUI_SetFooterString(v2); + //v2 = _w->GetDisplayName(); + GameUI_SetFooterString(_w->GetDisplayName()); } } } diff -r 591024ad7269 -r 37f42cfc881d UI/UiGame.cpp --- a/UI/UiGame.cpp Sat Nov 09 00:15:18 2013 +0600 +++ b/UI/UiGame.cpp Sun Nov 10 21:13:29 2013 +0600 @@ -1402,7 +1402,7 @@ { if ( !pButton ) break; - if ( pButton->uButtonType == 1 ) + if ( pButton->uButtonType == 1 )//for dialogue window { if ( (signed int)pX >= (signed int)pButton->uX && (signed int)pX <= (signed int)pButton->uZ @@ -1592,7 +1592,7 @@ if ( pMessageType2 != 0 ) pMessageQueue_50CBD0->AddMessage(pMessageType2, pButton->msg_param, 0); - GameUI_SetFooterString(pButton->pButtonName); + GameUI_SetFooterString(pButton->pButtonName); // for character name uLastPointedObjectID = 1; return; //}