Mercurial > might-and-magic-trilogy

comparison GUIWindow.cpp @ 169:bf2956650e92

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
12.12.12
author Ritor1
date Wed, 12 Dec 2012 17:07:27 +0600
parents 90a9c828c2a6
children af624eaf2fc5
comparison
equal deleted inserted replaced
168:12a0213e66c7 169:bf2956650e92
107 v2->uFrameHeight = v5; 107 v2->uFrameHeight = v5;
108 v7 = v2->uFrameHeight; 108 v7 = v2->uFrameHeight;
109 v2->uFrameZ = v6 + v2->uFrameX - 1; 109 v2->uFrameZ = v6 + v2->uFrameX - 1;
110 v2->uFrameW = v2->uFrameY + v7 - 1; 110 v2->uFrameW = v2->uFrameY + v7 - 1;
111 v2->DrawMessageBox(0); 111 v2->DrawMessageBox(0);
112 v2->DrawText2(pFontArrus, 0, 0xCu, 0, pGlobalTXT_LocalizationStrings[451], 3u); 112 v2->DrawTitleText(pFontArrus, 0, 0xCu, 0, pGlobalTXT_LocalizationStrings[451], 3u);
113 if ( !v19 ) 113 if ( !v19 )
114 v2->DrawText2(v1, 0, 0x28u, 0, pGlobalTXT_LocalizationStrings[153], 3u); 114 v2->DrawTitleText(v1, 0, 0x28u, 0, pGlobalTXT_LocalizationStrings[153], 3u);
115 v20 = 0; 115 v20 = 0;
116 GetTickCount(); 116 GetTickCount();
117 v8 = &_4E2B21_buff_spell_tooltip_colors[1]; 117 v8 = &_4E2B21_buff_spell_tooltip_colors[1];
118 v16 = aSpellNames; 118 v16 = aSpellNames;
119 v18 = pParty->pPartyBuffs; 119 v18 = pParty->pPartyBuffs;
1086 DrawPopupWindow(a2.y, v12, v21, v16); 1086 DrawPopupWindow(a2.y, v12, v21, v16);
1087 v17 = v3->Hint; 1087 v17 = v3->Hint;
1088 if ( v17 ) 1088 if ( v17 )
1089 { 1089 {
1090 v18 = pFontLucida->CalcTextHeight(v17, &v19, 0, 0); 1090 v18 = pFontLucida->CalcTextHeight(v17, &v19, 0, 0);
1091 v19.DrawText2(pFontLucida, 0, (signed int)(v16 - v18) / 2 - 14, 0, v17, 3u); 1091 v19.DrawTitleText(pFontLucida, 0, (signed int)(v16 - v18) / 2 - 14, 0, v17, 3u);
1092 } 1092 }
1093 } 1093 }
1094 1094
1095 1095
1096 //----- (0041192C) -------------------------------------------------------- 1096 //----- (0041192C) --------------------------------------------------------
1340 if ( v2 ) 1340 if ( v2 )
1341 { 1341 {
1342 v3 = 2 * LOBYTE(pFontCreate->uFontHeight) - 6 - pFontCreate->CalcTextHeight(v2, &w, 0, 0); 1342 v3 = 2 * LOBYTE(pFontCreate->uFontHeight) - 6 - pFontCreate->CalcTextHeight(v2, &w, 0, 0);
1343 if ( v3 < 0 ) 1343 if ( v3 < 0 )
1344 v3 = 0; 1344 v3 = 0;
1345 v18.DrawText2( 1345 v18.DrawTitleText(
1346 pFontCreate, 1346 pFontCreate,
1347 0x1EAu, 1347 0x1EAu,
1348 v3 / 2 + 4, 1348 v3 / 2 + 4,
1349 v1, 1349 v1,
1350 //(const char *)p2DEvents_minus1_::04[13 * (unsigned int)ptr_507BC0->ptr_1C], 1350 //(const char *)p2DEvents_minus1_::04[13 * (unsigned int)ptr_507BC0->ptr_1C],
1411 //v13 = (char *)p2DEvents_minus1__10[13 * (unsigned int)ptr_507BC0->ptr_1C]; 1411 //v13 = (char *)p2DEvents_minus1__10[13 * (unsigned int)ptr_507BC0->ptr_1C];
1412 v13 = (char *)p2DEvents[(unsigned int)ptr_507BC0->ptr_1C - 1].pProprieterTitle; 1412 v13 = (char *)p2DEvents[(unsigned int)ptr_507BC0->ptr_1C - 1].pProprieterTitle;
1413 v11 = v19; 1413 v11 = v19;
1414 v10 = 113; 1414 v10 = 113;
1415 LABEL_56: 1415 LABEL_56:
1416 v18.DrawText2(pFontCreate, 0x1E3u, v10, v11, v13, v15); 1416 v18.DrawTitleText(pFontCreate, 0x1E3u, v10, v11, v13, v15);
1417 goto LABEL_57; 1417 goto LABEL_57;
1418 } 1418 }
1419 v15 = 3; 1419 v15 = 3;
1420 v13 = array_5913D8[v8 - (dword_591080 != 0)]->pName; 1420 v13 = array_5913D8[v8 - (dword_591080 != 0)]->pName;
1421 v9 = dword_4E5EC8[v8 + 6 * uNumDialogueNPCPortraits] + pDialogueNPCPortraits[v8]->uTextureHeight + 2; 1421 v9 = dword_4E5EC8[v8 + 6 * uNumDialogueNPCPortraits] + pDialogueNPCPortraits[v8]->uTextureHeight + 2;
1446 pGlobalTXT_LocalizationStrings[429], 1446 pGlobalTXT_LocalizationStrings[429],
1447 //p2DEvents_minus1_::08[13 * (unsigned int)ptr_507BC0->ptr_1C], 1447 //p2DEvents_minus1_::08[13 * (unsigned int)ptr_507BC0->ptr_1C],
1448 p2DEvents[(unsigned int)ptr_507BC0->ptr_1C - 1].pProprieterName, 1448 p2DEvents[(unsigned int)ptr_507BC0->ptr_1C - 1].pProprieterName,
1449 //p2DEvents_minus1__10[13 * (unsigned int)ptr_507BC0->ptr_1C]); 1449 //p2DEvents_minus1__10[13 * (unsigned int)ptr_507BC0->ptr_1C]);
1450 p2DEvents[(unsigned int)ptr_507BC0->ptr_1C - 1].pProprieterTitle); 1450 p2DEvents[(unsigned int)ptr_507BC0->ptr_1C - 1].pProprieterTitle);
1451 v18.DrawText2(pFontCreate, 0x1E3u, 0x71u, v19, pTmpBuf, 3u); 1451 v18.DrawTitleText(pFontCreate, 0x1E3u, 0x71u, v19, pTmpBuf, 3u);
1452 if ( dword_F8B198 <= 18 ) 1452 if ( dword_F8B198 <= 18 )
1453 { 1453 {
1454 switch ( dword_F8B198 ) 1454 switch ( dword_F8B198 )
1455 { 1455 {
1456 case 18: 1456 case 18:
1603 sprintf(pTmpBuf2, "%d %s ", v17, v11); 1603 sprintf(pTmpBuf2, "%d %s ", v17, v11);
1604 strcat(pTmpBuf, pTmpBuf2); 1604 strcat(pTmpBuf, pTmpBuf2);
1605 } 1605 }
1606 v12 = GenerateColorAsCloseAsPossibleToR8G8B8InTargetFormat(0xFFu, 0xFFu, 0x9Bu); 1606 v12 = GenerateColorAsCloseAsPossibleToR8G8B8InTargetFormat(0xFFu, 0xFFu, 0x9Bu);
1607 v13 = pFontArrus->CalcTextHeight(pTmpBuf, v15, 0, 0); 1607 v13 = pFontArrus->CalcTextHeight(pTmpBuf, v15, 0, 0);
1608 return v15->DrawText2(pFontArrus, 0, (212 - v13) / 2 + 101, v12, pTmpBuf, 3u); 1608 return v15->DrawTitleText(pFontArrus, 0, (212 - v13) / 2 + 101, v12, pTmpBuf, 3u);
1609 } 1609 }
1610 1610
1611 1611
1612 1612
1613 //----- (0044D406) -------------------------------------------------------- 1613 //----- (0044D406) --------------------------------------------------------
1614 char *GUIWindow::DrawText2(GUIFont *a2, unsigned int uHorizontalMargin, unsigned int uVerticalMargin, unsigned __int16 uDefaultColor, const char *pInString, unsigned int uLineSpacing) 1614 char *GUIWindow::DrawTitleText(GUIFont *a2, unsigned int uHorizontalMargin, unsigned int uVerticalMargin, unsigned __int16 uDefaultColor, const char *pInString, unsigned int uLineSpacing)
1615 { 1615 {
1616 GUIWindow *pWindow; // esi@1 1616 GUIWindow *pWindow; // esi@1
1617 unsigned int v8; // ebx@1 1617 unsigned int v8; // ebx@1
1618 char *v9; // eax@1 1618 char *v9; // eax@1
1619 char *result; // eax@1 1619 char *result; // eax@1