Mercurial > mm7

comparison mm7_1.cpp @ 718:a5ee769b02c6

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Слияние
author Ritor1
date Mon, 18 Mar 2013 01:51:31 +0600
parents 2dfb67633b01
children efde64b3e147
comparison
equal deleted inserted replaced
717:d5473972234d 718:a5ee769b02c6
85 { 85 {
86 dword_507CC0 = 0; 86 dword_507CC0 = 0;
87 for ( i = pGUIWindow_CurrentMenu->pControlsHead; i; i = i->pNext ) 87 for ( i = pGUIWindow_CurrentMenu->pControlsHead; i; i = i->pNext )
88 { 88 {
89 if ( BYTE1(i->field_1C) & 0x80 ) 89 if ( BYTE1(i->field_1C) & 0x80 )
90 GUIButton::_41D0D8(i); 90 i->Release();
91 } 91 }
92 for ( j = pGUIWindow_CurrentMenu->pControlsHead; j; j = j->pNext ) 92 for ( j = pGUIWindow_CurrentMenu->pControlsHead; j; j = j->pNext )
93 { 93 {
94 if ( j->uControlID == 120 ) 94 if ( j->uControlID == 120 )
95 { 95 {
1457 1457
1458 //----- (0041B3B6) -------------------------------------------------------- 1458 //----- (0041B3B6) --------------------------------------------------------
1459 void __cdecl draw_right_panel() 1459 void __cdecl draw_right_panel()
1460 { 1460 {
1461 pRenderer->DrawTextureTransparent( 1461 pRenderer->DrawTextureTransparent(
1462 pViewport->uViewportZ, 1462 pViewport->uViewportBR_X,
1463 0, 1463 0,
1464 (Texture *)(uTextureID_right_panel != -1 ? (int)&pIcons_LOD->pTextures[uTextureID_right_panel] : 0)); 1464 (Texture *)(uTextureID_right_panel != -1 ? (int)&pIcons_LOD->pTextures[uTextureID_right_panel] : 0));
1465 } 1465 }
1466 1466
1467 //----- (0041B3E2) -------------------------------------------------------- 1467 //----- (0041B3E2) --------------------------------------------------------
4061 if ( (signed int)pX > 467 || (signed int)pY > 351 ) 4061 if ( (signed int)pX > 467 || (signed int)pY > 351 )
4062 goto _click_on_game_ui; 4062 goto _click_on_game_ui;
4063 if ( pRenderer->pRenderD3D ) 4063 if ( pRenderer->pRenderD3D )
4064 { 4064 {
4065 v18 = pGame->pVisInstance->get_picked_object_zbuf_val(); 4065 v18 = pGame->pVisInstance->get_picked_object_zbuf_val();
4066 if ( (signed int)pX < (signed int)pViewport->uScreenX 4066 if ( (signed int)pX < (signed int)pViewport->uScreen_TL_X
4067 || (signed int)pX > (signed int)pViewport->uScreenZ 4067 || (signed int)pX > (signed int)pViewport->uScreen_BR_X
4068 || (signed int)pY < (signed int)pViewport->uScreenY 4068 || (signed int)pY < (signed int)pViewport->uScreen_TL_Y
4069 || (signed int)pY > (signed int)pViewport->uScreenW ) 4069 || (signed int)pY > (signed int)pViewport->uScreen_BR_Y )
4070 v18 = -1; 4070 v18 = -1;
4071 if ( v18 == -1 ) 4071 if ( v18 == -1 )
4072 //goto LABEL_61; 4072 //goto LABEL_61;
4073 { 4073 {
4074 pMouse->uPointingObjectID = 0; 4074 pMouse->uPointingObjectID = 0;
4691 pAudioPlayer->StopChannels(-1, -1); 4691 pAudioPlayer->StopChannels(-1, -1);
4692 bRingsShownInCharScreen = 0; 4692 bRingsShownInCharScreen = 0;
4693 CharacterUI_LoadPaperdollTextures(); 4693 CharacterUI_LoadPaperdollTextures();
4694 pCurrentScreen = v1; 4694 pCurrentScreen = v1;
4695 pWindow = GUIWindow::Create(0, 0, 640, 480, WINDOW_CharacterRecord, uActiveCharacter, 0); 4695 pWindow = GUIWindow::Create(0, 0, 640, 480, WINDOW_CharacterRecord, uActiveCharacter, 0);
4696 pCharacterScreen_StatsBtn = pWindow->CreateButton(pViewport->uViewportX + 12, pViewport->uViewportY + 308, 4696 pCharacterScreen_StatsBtn = pWindow->CreateButton(pViewport->uViewportTL_X + 12, pViewport->uViewportTL_Y + 308,
4697 (papredoll_dbrds[9] != -1 ? pIcons_LOD->pTextures[papredoll_dbrds[9]].uTextureWidth : 24), 4697 (papredoll_dbrds[9] != -1 ? pIcons_LOD->pTextures[papredoll_dbrds[9]].uTextureWidth : 24),
4698 (papredoll_dbrds[9] != -1 ? pIcons_LOD->pTextures[papredoll_dbrds[9]].uTextureHeight : 26), 4698 (papredoll_dbrds[9] != -1 ? pIcons_LOD->pTextures[papredoll_dbrds[9]].uTextureHeight : 26),
4699 1, 0, 0x73u, 0, 0x53u, pGlobalTXT_LocalizationStrings[216],// Stats 4699 1, 0, 0x73u, 0, 0x53u, pGlobalTXT_LocalizationStrings[216],// Stats
4700 (Texture *)(papredoll_dbrds[10] != -1 ? (int)&pIcons_LOD->pTextures[papredoll_dbrds[10]] : 0), 4700 (Texture *)(papredoll_dbrds[10] != -1 ? (int)&pIcons_LOD->pTextures[papredoll_dbrds[10]] : 0),
4701 papredoll_dbrds[9] != -1 ? (int)&pIcons_LOD->pTextures[papredoll_dbrds[9]] : 0, 0); 4701 papredoll_dbrds[9] != -1 ? (int)&pIcons_LOD->pTextures[papredoll_dbrds[9]] : 0, 0);
4702 pCharacterScreen_SkillsBtn = pWindow->CreateButton(pViewport->uViewportX + 102, pViewport->uViewportY + 308, 4702 pCharacterScreen_SkillsBtn = pWindow->CreateButton(pViewport->uViewportTL_X + 102, pViewport->uViewportTL_Y + 308,
4703 (papredoll_dbrds[7] != -1 ? pIcons_LOD->pTextures[papredoll_dbrds[7]].uTextureWidth : 24), 4703 (papredoll_dbrds[7] != -1 ? pIcons_LOD->pTextures[papredoll_dbrds[7]].uTextureWidth : 24),
4704 (papredoll_dbrds[7] != -1 ? pIcons_LOD->pTextures[papredoll_dbrds[7]].uTextureHeight : 26), 4704 (papredoll_dbrds[7] != -1 ? pIcons_LOD->pTextures[papredoll_dbrds[7]].uTextureHeight : 26),
4705 1, 0, 0x72u, 0, 0x4Bu, pGlobalTXT_LocalizationStrings[205],//Skills 4705 1, 0, 0x72u, 0, 0x4Bu, pGlobalTXT_LocalizationStrings[205],//Skills
4706 (Texture *)(papredoll_dbrds[8] != -1 ? (int)&pIcons_LOD->pTextures[papredoll_dbrds[8]] : 0), 4706 (Texture *)(papredoll_dbrds[8] != -1 ? (int)&pIcons_LOD->pTextures[papredoll_dbrds[8]] : 0),
4707 papredoll_dbrds[7] != -1 ? (int)&pIcons_LOD->pTextures[papredoll_dbrds[7]] : 0, 0); 4707 papredoll_dbrds[7] != -1 ? (int)&pIcons_LOD->pTextures[papredoll_dbrds[7]] : 0, 0);
4708 pCharacterScreen_InventoryBtn = pWindow->CreateButton(pViewport->uViewportX + 192, pViewport->uViewportY + 308, 4708 pCharacterScreen_InventoryBtn = pWindow->CreateButton(pViewport->uViewportTL_X + 192, pViewport->uViewportTL_Y + 308,
4709 (papredoll_dbrds[5] != -1 ? pIcons_LOD->pTextures[papredoll_dbrds[5]].uTextureWidth : 24), 4709 (papredoll_dbrds[5] != -1 ? pIcons_LOD->pTextures[papredoll_dbrds[5]].uTextureWidth : 24),
4710 (papredoll_dbrds[5] != -1 ? pIcons_LOD->pTextures[papredoll_dbrds[5]].uTextureHeight : 26), 4710 (papredoll_dbrds[5] != -1 ? pIcons_LOD->pTextures[papredoll_dbrds[5]].uTextureHeight : 26),
4711 1, 0, 0x74u, 0, 0x49u, pGlobalTXT_LocalizationStrings[120], //Inventory 4711 1, 0, 0x74u, 0, 0x49u, pGlobalTXT_LocalizationStrings[120], //Inventory
4712 (Texture *)(papredoll_dbrds[6] != -1 ? (int)&pIcons_LOD->pTextures[papredoll_dbrds[6]] : 0), 4712 (Texture *)(papredoll_dbrds[6] != -1 ? (int)&pIcons_LOD->pTextures[papredoll_dbrds[6]] : 0),
4713 papredoll_dbrds[5] != -1 ? (int)&pIcons_LOD->pTextures[papredoll_dbrds[5]] : 0, 0); 4713 papredoll_dbrds[5] != -1 ? (int)&pIcons_LOD->pTextures[papredoll_dbrds[5]] : 0, 0);
4714 pCharacterScreen_AwardsBtn = pWindow->CreateButton(pViewport->uViewportX + 282, pViewport->uViewportY + 308, 4714 pCharacterScreen_AwardsBtn = pWindow->CreateButton(pViewport->uViewportTL_X + 282, pViewport->uViewportTL_Y + 308,
4715 (papredoll_dbrds[3] != -1 ? pIcons_LOD->pTextures[papredoll_dbrds[3]].uTextureWidth : 24), 4715 (papredoll_dbrds[3] != -1 ? pIcons_LOD->pTextures[papredoll_dbrds[3]].uTextureWidth : 24),
4716 (papredoll_dbrds[3] != -1 ? pIcons_LOD->pTextures[papredoll_dbrds[3]].uTextureHeight : 26), 4716 (papredoll_dbrds[3] != -1 ? pIcons_LOD->pTextures[papredoll_dbrds[3]].uTextureHeight : 26),
4717 1, 0, 0x75u, 0, 0x41u, pGlobalTXT_LocalizationStrings[22], //Awards 4717 1, 0, 0x75u, 0, 0x41u, pGlobalTXT_LocalizationStrings[22], //Awards
4718 (Texture *)(papredoll_dbrds[4] != -1 ? (int)&pIcons_LOD->pTextures[papredoll_dbrds[4]] : 0), 4718 (Texture *)(papredoll_dbrds[4] != -1 ? (int)&pIcons_LOD->pTextures[papredoll_dbrds[4]] : 0),
4719 papredoll_dbrds[3] != -1 ? (int)&pIcons_LOD->pTextures[papredoll_dbrds[3]] : 0, 0); 4719 papredoll_dbrds[3] != -1 ? (int)&pIcons_LOD->pTextures[papredoll_dbrds[3]] : 0, 0);
4720 pCharacterScreen_ExitBtn = pWindow->CreateButton(pViewport->uViewportX + 371, pViewport->uViewportY + 308, 4720 pCharacterScreen_ExitBtn = pWindow->CreateButton(pViewport->uViewportTL_X + 371, pViewport->uViewportTL_Y + 308,
4721 (papredoll_dbrds[1] != -1 ? pIcons_LOD->pTextures[papredoll_dbrds[1]].uTextureWidth : 24), 4721 (papredoll_dbrds[1] != -1 ? pIcons_LOD->pTextures[papredoll_dbrds[1]].uTextureWidth : 24),
4722 (papredoll_dbrds[1] != -1 ? pIcons_LOD->pTextures[papredoll_dbrds[1]].uTextureHeight : 26), 4722 (papredoll_dbrds[1] != -1 ? pIcons_LOD->pTextures[papredoll_dbrds[1]].uTextureHeight : 26),
4723 1, 0, 0xA8u, 0, 0, pGlobalTXT_LocalizationStrings[79],//Exit 4723 1, 0, 0xA8u, 0, 0, pGlobalTXT_LocalizationStrings[79],//Exit
4724 (Texture *)(papredoll_dbrds[2] != -1 ? (int)&pIcons_LOD->pTextures[papredoll_dbrds[2]] : 0), 4724 (Texture *)(papredoll_dbrds[2] != -1 ? (int)&pIcons_LOD->pTextures[papredoll_dbrds[2]] : 0),
4725 papredoll_dbrds[1] != -1 ? (int)&pIcons_LOD->pTextures[papredoll_dbrds[1]] : 0, 0); 4725 papredoll_dbrds[1] != -1 ? (int)&pIcons_LOD->pTextures[papredoll_dbrds[1]] : 0, 0);