Mercurial > mm7

comparison UI/UIPopup.cpp @ 2376:bcd7fadbf7d2

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Слияние
author Ritor1
date Mon, 12 May 2014 12:28:06 +0600
parents 14c05b876218 bddcaf5d5db2
children 8cee51ce4382
comparison
equal deleted inserted replaced
2375:14c05b876218 2376:bcd7fadbf7d2
130 int g_mask = 0x7E0; 130 int g_mask = 0x7E0;
131 int b_mask = 0x1F; 131 int b_mask = 0x1F;
132 132
133 if (!inspect_item->uItemID) 133 if (!inspect_item->uItemID)
134 return; 134 return;
135 iteminfo_window.Hint = 0; 135 iteminfo_window.Hint = nullptr;
136 iteminfo_window.uFrameWidth = 384; 136 iteminfo_window.uFrameWidth = 384;
137 iteminfo_window.uFrameHeight = 180; 137 iteminfo_window.uFrameHeight = 180;
138 iteminfo_window.uFrameY = 40; 138 iteminfo_window.uFrameY = 40;
139 if ( pMouse->GetCursorPos(&a2)->x <= 320 ) 139 if ( pMouse->GetCursorPos(&a2)->x <= 320 )
140 v2 = pMouse->GetCursorPos(&a2)->x + 30; 140 v2 = pMouse->GetCursorPos(&a2)->x + 30;
1254 spell_info_window.uFrameWidth = 328; 1254 spell_info_window.uFrameWidth = 328;
1255 spell_info_window.uFrameHeight = 68; 1255 spell_info_window.uFrameHeight = 68;
1256 spell_info_window.uFrameX = 90; 1256 spell_info_window.uFrameX = 90;
1257 spell_info_window.uFrameZ = 417; 1257 spell_info_window.uFrameZ = 417;
1258 spell_info_window.uFrameW = v3 + 67; 1258 spell_info_window.uFrameW = v3 + 67;
1259 spell_info_window.Hint = 0; 1259 spell_info_window.Hint = nullptr;
1260 v5 = pFontSmallnum->GetLineWidth(pGlobalTXT_LocalizationStrings[LOCSTR_NORMAL]); 1260 v5 = pFontSmallnum->GetLineWidth(pGlobalTXT_LocalizationStrings[LOCSTR_NORMAL]);
1261 if ( pFontSmallnum->GetLineWidth(pGlobalTXT_LocalizationStrings[LOCSTR_MASTER]) > v5 ) 1261 if ( pFontSmallnum->GetLineWidth(pGlobalTXT_LocalizationStrings[LOCSTR_MASTER]) > v5 )
1262 v5 = pFontSmallnum->GetLineWidth(pGlobalTXT_LocalizationStrings[LOCSTR_MASTER]); 1262 v5 = pFontSmallnum->GetLineWidth(pGlobalTXT_LocalizationStrings[LOCSTR_MASTER]);
1263 if ( pFontSmallnum->GetLineWidth(pGlobalTXT_LocalizationStrings[LOCSTR_EXPERT]) > v5 ) 1263 if ( pFontSmallnum->GetLineWidth(pGlobalTXT_LocalizationStrings[LOCSTR_EXPERT]) > v5 )
1264 v5 = pFontSmallnum->GetLineWidth(pGlobalTXT_LocalizationStrings[LOCSTR_EXPERT]); 1264 v5 = pFontSmallnum->GetLineWidth(pGlobalTXT_LocalizationStrings[LOCSTR_EXPERT]);
1376 if ( (signed int)pY > (signed int)pViewport->uViewportBR_Y ) 1376 if ( (signed int)pY > (signed int)pViewport->uViewportBR_Y )
1377 { 1377 {
1378 popup_window.ptr_1C = (void *)((signed int)pX / 118); 1378 popup_window.ptr_1C = (void *)((signed int)pX / 118);
1379 if ( (signed int)pX / 118 < 4 )//portaits zone 1379 if ( (signed int)pX / 118 < 4 )//portaits zone
1380 { 1380 {
1381 popup_window.Hint = 0; 1381 popup_window.Hint = nullptr;
1382 popup_window.uFrameWidth = 400; 1382 popup_window.uFrameWidth = 400;
1383 popup_window.uFrameHeight = 200; 1383 popup_window.uFrameHeight = 200;
1384 popup_window.uFrameX = 38; 1384 popup_window.uFrameX = 38;
1385 popup_window.uFrameY = 60; 1385 popup_window.uFrameY = 60;
1386 pAudioPlayer->StopChannels(-1, -1); 1386 pAudioPlayer->StopChannels(-1, -1);
1391 { 1391 {
1392 if ( (signed int)pY >= 130 ) 1392 if ( (signed int)pY >= 130 )
1393 { 1393 {
1394 if ( (signed int)pX >= 476 && (signed int)pX <= 636 && (signed int)pY >= 240 && (signed int)pY <= 300 )//buff_tooltip zone 1394 if ( (signed int)pX >= 476 && (signed int)pX <= 636 && (signed int)pY >= 240 && (signed int)pY <= 300 )//buff_tooltip zone
1395 { 1395 {
1396 popup_window.Hint = 0; 1396 popup_window.Hint = nullptr;
1397 popup_window.uFrameWidth = 400; 1397 popup_window.uFrameWidth = 400;
1398 popup_window.uFrameHeight = 200; 1398 popup_window.uFrameHeight = 200;
1399 popup_window.uFrameX = 38; 1399 popup_window.uFrameX = 38;
1400 popup_window.uFrameY = 60; 1400 popup_window.uFrameY = 60;
1401 pAudioPlayer->StopChannels(-1, -1); 1401 pAudioPlayer->StopChannels(-1, -1);
1426 popup_window.DrawMessageBox(0); 1426 popup_window.DrawMessageBox(0);
1427 } 1427 }
1428 } 1428 }
1429 else//game zone 1429 else//game zone
1430 { 1430 {
1431 popup_window.Hint = 0; 1431 popup_window.Hint = nullptr;
1432 popup_window.uFrameWidth = 320; 1432 popup_window.uFrameWidth = 320;
1433 popup_window.uFrameHeight = 320; 1433 popup_window.uFrameHeight = 320;
1434 popup_window.uFrameX = pX - 350; 1434 popup_window.uFrameX = pX - 350;
1435 if ( (signed int)pX <= 320 ) 1435 if ( (signed int)pX <= 320 )
1436 popup_window.uFrameX = pX + 30; 1436 popup_window.uFrameX = pX + 30;
1507 ShowPopupShopItem(); 1507 ShowPopupShopItem();
1508 break; 1508 break;
1509 } 1509 }
1510 case SCREEN_PARTY_CREATION: 1510 case SCREEN_PARTY_CREATION:
1511 { 1511 {
1512 popup_window.Hint = 0; 1512 popup_window.Hint = nullptr;
1513 pStr = 0; 1513 pStr = 0;
1514 for ( pButton = pGUIWindow_CurrentMenu->pControlsHead; pButton; pButton = pButton->pNext) 1514 for ( pButton = pGUIWindow_CurrentMenu->pControlsHead; pButton; pButton = pButton->pNext)
1515 { 1515 {
1516 if ( pButton->uButtonType == 1 && pButton->uButtonType != 3 && (signed int)pX > (signed int)pButton->uX && (signed int)pX < (signed int)pButton->uZ 1516 if ( pButton->uButtonType == 1 && pButton->uButtonType != 3 && (signed int)pX > (signed int)pButton->uX && (signed int)pX < (signed int)pButton->uZ
1517 && (signed int)pY > (signed int)pButton->uY && (signed int)pY < (signed int)pButton->uW ) 1517 && (signed int)pY > (signed int)pButton->uY && (signed int)pY < (signed int)pButton->uW )
1564 } 1564 }
1565 } 1565 }
1566 if ( popup_window.Hint ) 1566 if ( popup_window.Hint )
1567 { 1567 {
1568 pHint = popup_window.Hint; 1568 pHint = popup_window.Hint;
1569 popup_window.Hint = 0; 1569 popup_window.Hint = nullptr;
1570 popup_window.uFrameWidth = 384; 1570 popup_window.uFrameWidth = 384;
1571 popup_window.uFrameHeight = 256; 1571 popup_window.uFrameHeight = 256;
1572 popup_window.uFrameX = 128; 1572 popup_window.uFrameX = 128;
1573 popup_window.uFrameY = 40; 1573 popup_window.uFrameY = 40;
1574 popup_window.uFrameHeight = pFontSmallnum->CalcTextHeight(pHint, &popup_window, 24, 0) + 2 * LOBYTE(pFontLucida->uFontHeight) + 24; 1574 popup_window.uFrameHeight = pFontSmallnum->CalcTextHeight(pHint, &popup_window, 24, 0) + 2 * LOBYTE(pFontLucida->uFontHeight) + 24;