Mercurial > might-and-magic-trilogy
changeset 169:bf2956650e92
12.12.12
| author | Ritor1 |
|---|---|
| date | Wed, 12 Dec 2012 17:07:27 +0600 |
| parents | 12a0213e66c7 |
| children | f089d88b6739 9b5df6cc45a4 |
| files | GUIWindow.cpp GUIWindow.h mm7_1.cpp mm7_2.cpp mm7_3.cpp mm7_4.cpp mm7_5.cpp |
| diffstat | 7 files changed, 113 insertions(+), 113 deletions(-) [+] |
line wrap: on
line diff
--- a/GUIWindow.cpp Wed Dec 12 16:36:45 2012 +0600 +++ b/GUIWindow.cpp Wed Dec 12 17:07:27 2012 +0600 @@ -109,9 +109,9 @@ v2->uFrameZ = v6 + v2->uFrameX - 1; v2->uFrameW = v2->uFrameY + v7 - 1; v2->DrawMessageBox(0); - v2->DrawText2(pFontArrus, 0, 0xCu, 0, pGlobalTXT_LocalizationStrings[451], 3u); + v2->DrawTitleText(pFontArrus, 0, 0xCu, 0, pGlobalTXT_LocalizationStrings[451], 3u); if ( !v19 ) - v2->DrawText2(v1, 0, 0x28u, 0, pGlobalTXT_LocalizationStrings[153], 3u); + v2->DrawTitleText(v1, 0, 0x28u, 0, pGlobalTXT_LocalizationStrings[153], 3u); v20 = 0; GetTickCount(); v8 = &_4E2B21_buff_spell_tooltip_colors[1]; @@ -1088,7 +1088,7 @@ if ( v17 ) { v18 = pFontLucida->CalcTextHeight(v17, &v19, 0, 0); - v19.DrawText2(pFontLucida, 0, (signed int)(v16 - v18) / 2 - 14, 0, v17, 3u); + v19.DrawTitleText(pFontLucida, 0, (signed int)(v16 - v18) / 2 - 14, 0, v17, 3u); } } @@ -1342,7 +1342,7 @@ v3 = 2 * LOBYTE(pFontCreate->uFontHeight) - 6 - pFontCreate->CalcTextHeight(v2, &w, 0, 0); if ( v3 < 0 ) v3 = 0; - v18.DrawText2( + v18.DrawTitleText( pFontCreate, 0x1EAu, v3 / 2 + 4, @@ -1413,7 +1413,7 @@ v11 = v19; v10 = 113; LABEL_56: - v18.DrawText2(pFontCreate, 0x1E3u, v10, v11, v13, v15); + v18.DrawTitleText(pFontCreate, 0x1E3u, v10, v11, v13, v15); goto LABEL_57; } v15 = 3; @@ -1448,7 +1448,7 @@ p2DEvents[(unsigned int)ptr_507BC0->ptr_1C - 1].pProprieterName, //p2DEvents_minus1__10[13 * (unsigned int)ptr_507BC0->ptr_1C]); p2DEvents[(unsigned int)ptr_507BC0->ptr_1C - 1].pProprieterTitle); - v18.DrawText2(pFontCreate, 0x1E3u, 0x71u, v19, pTmpBuf, 3u); + v18.DrawTitleText(pFontCreate, 0x1E3u, 0x71u, v19, pTmpBuf, 3u); if ( dword_F8B198 <= 18 ) { switch ( dword_F8B198 ) @@ -1605,13 +1605,13 @@ } v12 = GenerateColorAsCloseAsPossibleToR8G8B8InTargetFormat(0xFFu, 0xFFu, 0x9Bu); v13 = pFontArrus->CalcTextHeight(pTmpBuf, v15, 0, 0); - return v15->DrawText2(pFontArrus, 0, (212 - v13) / 2 + 101, v12, pTmpBuf, 3u); + return v15->DrawTitleText(pFontArrus, 0, (212 - v13) / 2 + 101, v12, pTmpBuf, 3u); } //----- (0044D406) -------------------------------------------------------- -char *GUIWindow::DrawText2(GUIFont *a2, unsigned int uHorizontalMargin, unsigned int uVerticalMargin, unsigned __int16 uDefaultColor, const char *pInString, unsigned int uLineSpacing) +char *GUIWindow::DrawTitleText(GUIFont *a2, unsigned int uHorizontalMargin, unsigned int uVerticalMargin, unsigned __int16 uDefaultColor, const char *pInString, unsigned int uLineSpacing) { GUIWindow *pWindow; // esi@1 unsigned int v8; // ebx@1
--- a/GUIWindow.h Wed Dec 12 16:36:45 2012 +0600 +++ b/GUIWindow.h Wed Dec 12 17:07:27 2012 +0600 @@ -63,7 +63,7 @@ void DrawFlashingInputCursor(signed int a3, int a4, struct GUIFont *a2); int DrawTextInRect(GUIFont *a2, unsigned int uX, unsigned int uY, unsigned int uColor, const char *Str1, int Source, int a8); char DrawText(GUIFont *a2, signed int uX, int uY, unsigned int uFontColor, const char *Str, int a7, int a8, unsigned int uFontShadowColor); - char *DrawText2(GUIFont *a2, unsigned int uHorizontalMargin, unsigned int uVerticalMargin, unsigned __int16 uDefaultColor, const char *pInString, unsigned int uLineSpacing); + char *DrawTitleText(GUIFont *a2, unsigned int uHorizontalMargin, unsigned int uVerticalMargin, unsigned __int16 uDefaultColor, const char *pInString, unsigned int uLineSpacing); char *_4B1854(__int64 a2); void _4B3157(); GUIButton *_411621();
--- a/mm7_1.cpp Wed Dec 12 16:36:45 2012 +0600 +++ b/mm7_1.cpp Wed Dec 12 17:07:27 2012 +0600 @@ -2613,7 +2613,7 @@ v16 = _this->GetIdentifiedName(); else v16 = (const char *)*((int *)v76 + 2); - v79.DrawText2(pFontArrus, 0, 0xCu, var88, v16, 3u); + v79.DrawTitleText(pFontArrus, 0, 0xCu, var88, v16, 3u); v17 = pFontArrus->CalcTextHeight(pGlobalTXT_LocalizationStrings[32], &v79, 0, 0); v57 = 3; v52 = pGlobalTXT_LocalizationStrings[32]; @@ -2636,14 +2636,14 @@ v79.uFrameX + v78, v81 + v79.uFrameY + 30, (Texture *)(v5 != -1 ? (int)((char *)pIcons_LOD->pTextures + v75) : 0)); - v79.DrawText2(pFontArrus, 0, 0xCu, var88, *((const char **)v76 + 2), 3u); + v79.DrawTitleText(pFontArrus, 0, 0xCu, var88, *((const char **)v76 + 2), 3u); v17 = pFontArrus->CalcTextHeight(pGlobalTXT_LocalizationStrings[232], &v79, 0, 0); v57 = 3; v52 = pGlobalTXT_LocalizationStrings[232]; LABEL_37: v18 = v17 >> 1; v19 = GenerateColorAsCloseAsPossibleToR8G8B8InTargetFormat(0xFFu, 0x19u, 0x19u); - v79.DrawText2(pFontArrus, 0x64u, ((signed int)v79.uFrameHeight >> 1) - v18, v19, v52, v57); + v79.DrawTitleText(pFontArrus, 0x64u, ((signed int)v79.uFrameHeight >> 1) - v18, v19, v52, v57); goto LABEL_116; } sprintf(a1, pGlobalTXT_LocalizationStrings[463], *((int *)v3 + 2)); @@ -2779,7 +2779,7 @@ v79.uFrameX += 12; v79.uFrameWidth -= 24; v36 = _this->GetIdentifiedName(); - v79.DrawText2(pFontArrus, 0, 0xCu, var88, v36, 3u); + v79.DrawTitleText(pFontArrus, 0, 0xCu, var88, v36, 3u); v79.uFrameWidth += 24; v79.uFrameX -= 12; if ( v77 ) @@ -3301,7 +3301,7 @@ strncpy(pTmpBuf, v72, v77); LABEL_59: v39 = GenerateColorAsCloseAsPossibleToR8G8B8InTargetFormat(0xFFu, 0xFFu, 0x9Bu); - a1->DrawText2(pFontComic, 0, 0xCu, v39, pTmpBuf, 3u); + a1->DrawTitleText(pFontComic, 0, 0xCu, v39, pTmpBuf, 3u); Actor::DrawHealthBar(v121, a1); v119 = 0; pMonsterInfoUI_Doll.uCurrentActionTime += pMiscTimer->uTimeElapsed; @@ -3718,7 +3718,7 @@ { sprintf(pTmpBuf, "%s: %d", pGlobalTXT_LocalizationStrings[650], v121->sCurrentHP); pFontSmallnum->GetLineWidth(pTmpBuf); - result = a1->DrawText2( + result = a1->DrawTitleText( pFontSmallnum, 0, a1->uFrameHeight - LOBYTE(pFontSmallnum->uFontHeight) - 12,
--- a/mm7_2.cpp Wed Dec 12 16:36:45 2012 +0600 +++ b/mm7_2.cpp Wed Dec 12 17:07:27 2012 +0600 @@ -72,7 +72,7 @@ v5.uFrameZ = 334; v2 = GenerateColorAsCloseAsPossibleToR8G8B8InTargetFormat(0xFFu, 0xFFu, 0x9Bu); v3 = pFontArrus->CalcTextHeight(v0, &v5, 0, 0); - return v5.DrawText2(pFontArrus, 0, (310 - v3) / 2 + 18, v2, v1, 3u); + return v5.DrawTitleText(pFontArrus, 0, (310 - v3) / 2 + 18, v2, v1, 3u); } @@ -147,7 +147,7 @@ v28 = GenerateColorAsCloseAsPossibleToR8G8B8InTargetFormat(0xFFu, 0xFFu, 0xFFu); v30 = GenerateColorAsCloseAsPossibleToR8G8B8InTargetFormat(0xFFu, 0xFFu, 0x9Bu); sprintf(pTmpBuf, "%s: %d", pGlobalTXT_LocalizationStrings[605], pParty->uFine); - _this.DrawText2(pFontArrus, 0, 0x104u, v30, pTmpBuf, 3u); + _this.DrawTitleText(pFontArrus, 0, 0x104u, v30, pTmpBuf, 3u); if ( dword_F8B19C == 1 ) { v11 = 1; @@ -189,7 +189,7 @@ v24 = v30; if ( pDialogueWindow->pCurrentPosActiveItem != v31 ) v24 = v28; - _this.DrawText2(pFontArrus, 0, v23, v24, *v19, 3u); + _this.DrawTitleText(pFontArrus, 0, v23, v24, *v19, 3u); v14 = pDialogueWindow; ++v31; ++v19; @@ -208,8 +208,8 @@ if ( ptr_507BC0->field_40 == 1 ) { sprintf(pTmpBuf, "%s\n%s", pGlobalTXT_LocalizationStrings[606], pGlobalTXT_LocalizationStrings[112]); - _this.DrawText2(pFontArrus, 0, 0x92u, v30, pTmpBuf, 3u); - _this.DrawText2(pFontArrus, 0, 0xBAu, v28, (const char *)pKeyActionMap->pPressedKeysBuffer, 3u); + _this.DrawTitleText(pFontArrus, 0, 0x92u, v30, pTmpBuf, 3u); + _this.DrawTitleText(pFontArrus, 0, 0xBAu, v28, (const char *)pKeyActionMap->pPressedKeysBuffer, 3u); v3 = pFontArrus; v4 = pFontArrus->GetLineWidth((const char *)pKeyActionMap->pPressedKeysBuffer); _this.DrawFlashingInputCursor(v4 / 2 + 80, 185, v3); @@ -312,7 +312,7 @@ *(int *)v13 = GenerateColorAsCloseAsPossibleToR8G8B8InTargetFormat(0xFFu, 0xFFu, 0xFFu); *(int *)v14 = GenerateColorAsCloseAsPossibleToR8G8B8InTargetFormat(0xFFu, 0xFFu, 0x9Bu); sprintf(pTmpBuf, "%s: %d", pGlobalTXT_LocalizationStrings[25], pParty->uNumGoldInBank); - _this.DrawText2(pFontArrus, 0, 0xDCu, v14[0], pTmpBuf, 3u); + _this.DrawTitleText(pFontArrus, 0, 0xDCu, v14[0], pTmpBuf, 3u); if ( dword_F8B19C != 1 ) { if ( dword_F8B19C == 7 ) @@ -396,8 +396,8 @@ v10 = pGlobalTXT_LocalizationStrings[244]; } sprintf(pTmpBuf, "%s\n%s", v10, v11); - _this.DrawText2(pFontArrus, 0, 0x92u, v14[0], pTmpBuf, 3u); - _this.DrawText2(pFontArrus, 0, 0xBAu, v13[0], (const char *)pKeyActionMap->pPressedKeysBuffer, 3u); + _this.DrawTitleText(pFontArrus, 0, 0x92u, v14[0], pTmpBuf, 3u); + _this.DrawTitleText(pFontArrus, 0, 0xBAu, v13[0], (const char *)pKeyActionMap->pPressedKeysBuffer, 3u); v4 = pFontArrus; v5 = pFontArrus->GetLineWidth((const char *)pKeyActionMap->pPressedKeysBuffer); _this.DrawFlashingInputCursor(v5 / 2 + 80, 185, v4); @@ -406,11 +406,11 @@ v8 = v14[0]; if ( pDialogueWindow->pCurrentPosActiveItem != 2 ) v8 = v13[0]; - _this.DrawText2(pFontArrus, 0, 0x92u, v8, pGlobalTXT_LocalizationStrings[60], 3u); + _this.DrawTitleText(pFontArrus, 0, 0x92u, v8, pGlobalTXT_LocalizationStrings[60], 3u); v9 = v14[0]; if ( pDialogueWindow->pCurrentPosActiveItem != 3 ) v9 = v13[0]; - _this.DrawText2(pFontArrus, 0, 0xB0u, v9, pGlobalTXT_LocalizationStrings[244], 3u); + _this.DrawTitleText(pFontArrus, 0, 0xB0u, v9, pGlobalTXT_LocalizationStrings[244], 3u); } // F8B19C: using guessed type int dword_F8B19C; @@ -683,7 +683,7 @@ if ( v86 ) { sprintf(pTmpBuf, pGlobalTXT_LocalizationStrings[401], pOutString); - v79.DrawText2(pFontArrus, 0, 0x92u, 0, pTmpBuf, 3u); + v79.DrawTitleText(pFontArrus, 0, 0x92u, 0, pTmpBuf, 3u); pOutString = (GUIFont *)((149 - v89) / v86); if ( (149 - v89) / v86 > 32 ) pOutString = (GUIFont *)32; @@ -719,7 +719,7 @@ v23 = v84[0]; if ( pDialogueWindow->pCurrentPosActiveItem != v21 ) v23 = v81; - v79.DrawText2(pFontArrus, 0, v20, v23, Str[1], 3u); + v79.DrawTitleText(pFontArrus, 0, v20, v23, Str[1], 3u); } v24 = v8->pNumPresenceButton; ++v89; @@ -823,7 +823,7 @@ v67 = 0; v66 = 146; LABEL_98: - v79.DrawText2(pFontArrus, 0, v66, v67, v69, v71); + v79.DrawTitleText(pFontArrus, 0, v66, v67, v69, v71); return; } while ( 1 ) @@ -914,7 +914,7 @@ v60 = v84[0]; if ( (Player *)pDialogueWindow->pCurrentPosActiveItem != v59 ) v60 = v81; - v79.DrawText2(pFontArrus, 0, v58, v60, *(const char **)&pOutString->cFirstChar, 3u); + v79.DrawTitleText(pFontArrus, 0, v58, v60, *(const char **)&pOutString->cFirstChar, 3u); v51 = pDialogueWindow; v85 = (Player *)((char *)v85 + 1); pOutString = (GUIFont *)((char *)pOutString + 4); @@ -1170,7 +1170,7 @@ v76 = v104; if ( (Player *)pDialogueWindow->pCurrentPosActiveItem != v75 ) v76 = v105; - v101.DrawText2(pFontArrus, 0, v74, v76, *(const char **)v108, 3u); + v101.DrawTitleText(pFontArrus, 0, v74, v76, *(const char **)v108, 3u); v68 = pDialogueWindow; _this = (Player *)((char *)_this + 1); v108 += 4; @@ -1231,7 +1231,7 @@ goto LABEL_15; } sprintf(pTmpBuf, pGlobalTXT_LocalizationStrings[401], v108); - v101.DrawText2(pFontArrus, 0, 0x92u, 0, pTmpBuf, 3u); + v101.DrawTitleText(pFontArrus, 0, 0x92u, 0, pTmpBuf, 3u); v108 = (149 - v106.y) / (signed int)v109; if ( (149 - v106.y) / (signed int)v109 > 32 ) v108 = 32; @@ -1268,7 +1268,7 @@ v46 = v104; if ( (const char **)pDialogueWindow->pCurrentPosActiveItem != v44 ) v46 = v105; - v101.DrawText2(pFontArrus, 0, v43, v46, Str, 3u); + v101.DrawTitleText(pFontArrus, 0, v43, v46, Str, 3u); } v47 = v30->pStartingPosActiveItem; ++v106.y; @@ -1371,7 +1371,7 @@ v26 = v104; if ( pDialogueWindow->pCurrentPosActiveItem != v25 ) v26 = v105; - v101.DrawText2(pFontArrus, 0, v24, v26, *v109, 3u); + v101.DrawTitleText(pFontArrus, 0, v24, v26, *v109, 3u); v17 = pDialogueWindow; ++v108; ++v109; @@ -1472,7 +1472,7 @@ v77 = &v101; LABEL_15: v8 = pFontArrus->CalcTextHeight(v7, v77, v78, v80); - return v101.DrawText2(pFontArrus, v3, (174 - v8) / 2 + 138, v82, v84, v86); + return v101.DrawTitleText(pFontArrus, v3, (174 - v8) / 2 + 138, v82, v84, v86); } } } @@ -1788,7 +1788,7 @@ v83 = v106; if ( (Player *)pDialogueWindow->pCurrentPosActiveItem != v82 ) v83 = v108; - v104.DrawText2(pFontArrus, 0, v81, v83, *v111, 3u); + v104.DrawTitleText(pFontArrus, 0, v81, v83, *v111, 3u); v75 = pDialogueWindow; _this = (Player *)((char *)_this + 1); ++v111; @@ -1912,7 +1912,7 @@ v35 = v106; if ( (Player *)pDialogueWindow->pCurrentPosActiveItem != v33 ) v35 = v108; - v104.DrawText2(pFontArrus, 0, v32, v35, *v111, 3u); + v104.DrawTitleText(pFontArrus, 0, v32, v35, *v111, 3u); v25 = pDialogueWindow; _this = (Player *)((char *)_this + 1); ++v111; @@ -1958,7 +1958,7 @@ if ( v114 ) { sprintf(pTmpBuf, pGlobalTXT_LocalizationStrings[401], v111); - v104.DrawText2(pFontArrus, 0, 0x92u, 0, pTmpBuf, 3u); + v104.DrawTitleText(pFontArrus, 0, 0x92u, 0, pTmpBuf, 3u); v111 = (const char **)((signed int)(149 - v112) / v114); if ( (signed int)(149 - v112) / v114 > 32 ) v111 = (const char **)32; @@ -1995,7 +1995,7 @@ v19 = v106; if ( pDialogueWindow->pCurrentPosActiveItem != v17 ) v19 = v108; - v104.DrawText2(pFontArrus, 0, v16, v19, Str, 3u); + v104.DrawTitleText(pFontArrus, 0, v16, v19, Str, 3u); } v20 = v2->pStartingPosActiveItem; ++v112; @@ -2019,7 +2019,7 @@ v84 = &v104; LABEL_46: v40 = pFontArrus->CalcTextHeight(v21, v84, v85, v86); - return (POINT *)v104.DrawText2(pFontArrus, v3, (174 - v40) / 2 + 138, v88, v90, v92); + return (POINT *)v104.DrawTitleText(pFontArrus, v3, (174 - v40) / 2 + 138, v88, v90, v92); } } pRenderer->DrawTextureIndexed(8u, 8u, dword_F8B164); @@ -2433,7 +2433,7 @@ v101 = v100; v102 = v148; v103 = pFontArrus->CalcTextHeight(v100, &v144, 0, 0); - v144.DrawText2(pFontArrus, 0, (174 - v103) / 2 + 138, v102, v101, 3u); + v144.DrawTitleText(pFontArrus, 0, (174 - v103) / 2 + 138, v102, v101, 3u); } v104 = 0; v153 = 0; @@ -2511,7 +2511,7 @@ v92 = v147; if ( pDialogueWindow->pCurrentPosActiveItem != v91 ) v92 = v148; - v144.DrawText2(pFontArrus, 0, v90, v92, *v79, 3u); + v144.DrawTitleText(pFontArrus, 0, v90, v92, *v79, 3u); v83 = pDialogueWindow; ++v153; ++v79; @@ -2552,7 +2552,7 @@ if ( v153 ) { sprintf(pTmpBuf, pGlobalTXT_LocalizationStrings[401], _this); - v144.DrawText2(pFontArrus, 0, 0x92u, 0, pTmpBuf, 3u); + v144.DrawTitleText(pFontArrus, 0, 0x92u, 0, pTmpBuf, 3u); _this = (Player *)((149 - v152) / v153); if ( (149 - v152) / v153 > 32 ) _this = (Player *)32; @@ -2588,7 +2588,7 @@ v52 = v147; if ( pDialogueWindow->pCurrentPosActiveItem != v50 ) v52 = v148; - v144.DrawText2(pFontArrus, 0, v49, v52, Str, 3u); + v144.DrawTitleText(pFontArrus, 0, v49, v52, Str, 3u); } v53 = v37->pStartingPosActiveItem; ++v152; @@ -2615,7 +2615,7 @@ v115 = (174 - pFontArrus->CalcTextHeight(v36, v111, v113, v117)) / 2 + 138; v112 = (unsigned int)v11; LABEL_14: - v144.DrawText2(pFontArrus, v112, v115, v119, v121, v123); + v144.DrawTitleText(pFontArrus, v112, v115, v119, v121, v123); return; } LABEL_64: @@ -2841,7 +2841,7 @@ v30 = v147; if ( (Player *)pDialogueWindow->pCurrentPosActiveItem != v29 ) v30 = v148; - v144.DrawText2(pFontArrus, 0, v28, v30, *v16, 3u); + v144.DrawTitleText(pFontArrus, 0, v28, v30, *v16, 3u); v20 = pDialogueWindow; _this = (Player *)((char *)_this + 1); ++v16; @@ -5149,7 +5149,7 @@ if ( !v19 ) v19 = 1; pRenderer->BeginScene(); - pWindow.DrawText2(pFont, 1u, 0x23u, 1u, pGlobalTXT_LocalizationStrings[9], 3u); + pWindow.DrawTitleText(pFont, 1u, 0x23u, 1u, pGlobalTXT_LocalizationStrings[9], 3u); v3 = pParty->pPlayers[0].pName; v23 = 0i64; v20 = 0; @@ -5158,7 +5158,7 @@ v4 = pClassNames[(unsigned __int8)v3[17]]; v5 = ((Player *)(v3 - 168))->GetBaseLevel(); sprintf(pTmpBuf, pGlobalTXT_LocalizationStrings[129], i, v5, v4); - pWindow.DrawText2( + pWindow.DrawTitleText( pFont, 1u, v20 * (LOBYTE(pFont->uFontHeight) - 2) + LOBYTE(pFont->uFontHeight) + 46, @@ -5173,7 +5173,7 @@ } v23 = (signed __int64)v23 / v19; v6 = FitTextInAWindow(pInString, pFont, &pWindow, 0xCu, 0); - pWindow.DrawText2(pFont, 1u, 5 * (LOBYTE(pFont->uFontHeight) + 11), 1u, v6, 0); + pWindow.DrawTitleText(pFont, 1u, 5 * (LOBYTE(pFont->uFontHeight) + 11), 1u, v6, 0); strcpy(pTmpBuf, pGlobalTXT_LocalizationStrings[37]); v7 = pGlobalTXT_LocalizationStrings[56]; if ( v17 != 1 ) @@ -5186,9 +5186,9 @@ v9 = pGlobalTXT_LocalizationStrings[132]; sprintf(pTmpBuf2, " %lu %s, %lu %s, %lu %s ", v14, v9, v18, v8, v17, v7); strcat(pTmpBuf, pTmpBuf2); - pWindow.DrawText2(pFont, 1u, pWindow.uFrameHeight - 2 * LOBYTE(pFont->uFontHeight) - 5, 1u, pTmpBuf, 3u); + pWindow.DrawTitleText(pFont, 1u, pWindow.uFrameHeight - 2 * LOBYTE(pFont->uFontHeight) - 5, 1u, pTmpBuf, 3u); sprintf(pTmpBuf, pGlobalTXT_LocalizationStrings[94], v23); - pWindow.DrawText2(pFont, 1u, pWindow.uFrameHeight, 1u, pTmpBuf, 3u); + pWindow.DrawTitleText(pFont, 1u, pWindow.uFrameHeight, 1u, pTmpBuf, 3u); BYTE1(dword_6BE364_game_settings_1) |= 0x40u; pRenderer->EndScene(); pRenderer->Present(); @@ -11486,7 +11486,7 @@ v6 = uLoadGameUI_SelectedSlot; } pMapID = pMapStats->GetMapInfo(pSavegameHeader[v6].pLocationName); - pWindow.DrawText2(pFontSmallnum, 0, 0, 0, pMapStats->pInfos[pMapID].pName, 3); + pWindow.DrawTitleText(pFontSmallnum, 0, 0, 0, pMapStats->pInfos[pMapID].pName, 3); v8 = (signed __int64)(pSavegameHeader[uLoadGameUI_SelectedSlot].uWordTime * 0.234375) / 60; HIDWORD(v32) = (unsigned __int64)((signed __int64)(pSavegameHeader[uLoadGameUI_SelectedSlot].uWordTime * 0.234375) / 60) >> 32; v9 = v8; @@ -11532,7 +11532,7 @@ auto _m = aMonthNames[v33]; sprintf(pTmpBuf, "%s %d:%02d%s\n%d %s %d", _d, v17, (int)32, _a, 3, _m, pFilesID); sprintf(pTmpBuf, "%s %d:%02d%s\n%d %s %d", _d, v17, (int)v32, _a, 7 * v16 + HIDWORD(v15) % 7 + 1, _m, pFilesID); - pWindow.DrawText2(pFontSmallnum, 0, 0, 0, pTmpBuf, 3u); + pWindow.DrawTitleText(pFontSmallnum, 0, 0, 0, pTmpBuf, 3u); v1 = 255; } if ( pGUIWindow_CurrentMenu->field_40 == 2 ) @@ -15072,7 +15072,7 @@ v1 = pItemsTable->pItems[(unsigned int)pGUIWindow_ScrollWindow->ptr_1C + 700].pName; v2 = GenerateColorAsCloseAsPossibleToR8G8B8InTargetFormat(0xFFu, 0xFFu, 0x9Bu); sprintf(pTmpBuf, format_4E2D80, v2, v1); - a1.DrawText2(pFontCreate, 0, 0, 0, pTmpBuf, 3u); + a1.DrawTitleText(pFontCreate, 0, 0, 0, pTmpBuf, 3u); return a1.DrawText( pFontSmallnum, 1,
--- a/mm7_3.cpp Wed Dec 12 16:36:45 2012 +0600 +++ b/mm7_3.cpp Wed Dec 12 17:07:27 2012 +0600 @@ -15813,7 +15813,7 @@ v8.uFrameX = 493; v8.uFrameWidth = 126; v8.uFrameZ = 366; - v8.DrawText2(pFontCreate, 0, 5u, 0, v0->pName, 3u); + v8.DrawTitleText(pFontCreate, 0, 5u, 0, v0->pName, 3u); v8.uFrameX = 483; v8.uFrameWidth = 148; v8.uFrameZ = 334; @@ -15841,7 +15841,7 @@ v6 = v1; v5 = 0; v4 = (212 - pFontCreate->CalcTextHeight(v1, &v8, 0, 0)) / 2 + 101; - result = v8.DrawText2(pFontCreate, 0, v4, v5, v6, v7); + result = v8.DrawTitleText(pFontCreate, 0, v4, v5, v6, v7); dword_5B5924 = 1; return result; } @@ -15936,7 +15936,7 @@ v7.uFrameWidth = 126; v2 = v1->pName; v7.uFrameZ = 366; - v7.DrawText2(pFontCreate, 0, 4u, 0, v2, 3u); + v7.DrawTitleText(pFontCreate, 0, 4u, 0, v2, 3u); v7.uFrameX = 483; v7.uFrameWidth = 148; v7.uFrameZ = 334; @@ -15956,7 +15956,7 @@ sprintf(pTmpBuf2, pGlobalTXT_LocalizationStrings[126], pMapStats->pInfos[v9].pName); strcat(pTmpBuf, pTmpBuf2); v4 = pFontCreate->CalcTextHeight(pTmpBuf, &v7, 0, 0); - v7.DrawText2(pFontCreate, 0, (212 - v4) / 2 + 101, 0, pTmpBuf, 3u); + v7.DrawTitleText(pFontCreate, 0, (212 - v4) / 2 + 101, 0, pTmpBuf, 3u); dword_5B5924 = 1; } } @@ -16181,7 +16181,7 @@ strcpy(pTmpBuf, v0->pName); v4 = pTmpBuf; } - v51.DrawText2(pFontArrus, 0x1E3u, 0x70u, v2, v4, 3u); + v51.DrawTitleText(pFontArrus, 0x1E3u, 0x70u, v2, v4, 3u); pParty->GetPartyFame(); if ( (signed int)uDialogueType > 89 ) { @@ -16494,7 +16494,7 @@ v47 = v54[0]; if ( (unsigned __int16 *)pDialogueWindow->pCurrentPosActiveItem != v46 ) v47 = (unsigned __int16)pInString; - v52.DrawText2(pFontArrus, 0, v45, v47, Str, 3u); + v52.DrawTitleText(pFontArrus, 0, v45, v47, Str, 3u); v34 = pDialogueWindow; v55 = (unsigned __int16 *)((char *)v55 + 1); ++v41;
--- a/mm7_4.cpp Wed Dec 12 16:36:45 2012 +0600 +++ b/mm7_4.cpp Wed Dec 12 17:07:27 2012 +0600 @@ -9136,13 +9136,13 @@ a1.uFrameZ = a1.uFrameX + a1.uFrameWidth - 1; a1.uFrameW = a1.uFrameHeight + a1.uFrameY - 1; v8 = GenerateColorAsCloseAsPossibleToR8G8B8InTargetFormat(0xFFu, 0xFFu, 0x9Bu); - a1.DrawText2(pFontArrus, 0x78u, 0xCu, v8, v7, 3u); + a1.DrawTitleText(pFontArrus, 0x78u, 0xCu, v8, v7, 3u); a1.DrawText(pFontSmallnum, 120, 44, 0, pTmpBuf2, 0, 0, 0); a1.uFrameZ = a1.uFrameX + 107; a1.uFrameWidth = 108; - a1.DrawText2(pFontComic, 0xCu, 0x4Bu, 0, pSkillNames[v11 / 4 + 12], 3u); + a1.DrawTitleText(pFontComic, 0xCu, 0x4Bu, 0, pSkillNames[v11 / 4 + 12], 3u); sprintf(pTmpBuf, "%s\n%d", pGlobalTXT_LocalizationStrings[522], *(&pSpellDatas[0].uNormalLevelMana + 10 * v1)); - return a1.DrawText2( + return a1.DrawTitleText( pFontComic, 0xCu, a1.uFrameHeight - LOBYTE(pFontComic->uFontHeight) - 16, @@ -9179,7 +9179,7 @@ // "do anything" v2 = GenerateColorAsCloseAsPossibleToR8G8B8InTargetFormat(0xFFu, 0xFFu, 0x9Bu); v3 = pFontArrus->CalcTextHeight(pTmpBuf, &v4, 0, 0); - v4.DrawText2(pFontArrus, 0, (212 - v3) / 2 + 101, v2, pTmpBuf, 3u); + v4.DrawTitleText(pFontArrus, 0, (212 - v3) / 2 + 101, v2, pTmpBuf, 3u); result = 0; } return result; @@ -10236,7 +10236,7 @@ a1.uFrameX = 493; a1.uFrameWidth = 126; a1.uFrameZ = 366; - a1.DrawText2(pFontCreate, 0, 2u, 0, v1, 3u); + a1.DrawTitleText(pFontCreate, 0, 2u, 0, v1, 3u); a1.uFrameX = 483; a1.uFrameWidth = 148; a1.uFrameZ = 334; @@ -10248,7 +10248,7 @@ } v3 = v2; v4 = pFontCreate->CalcTextHeight(v2, &a1, 0, 0); - LOBYTE(i) = (unsigned int)a1.DrawText2(pFontCreate, 0, (212 - v4) / 2 + 101, 0, v3, 3u); + LOBYTE(i) = (unsigned int)a1.DrawTitleText(pFontCreate, 0, (212 - v4) / 2 + 101, 0, v3, 3u); return i; } a1.uFrameWidth -= 10; @@ -10262,7 +10262,7 @@ sprintf(pTmpBuf, pGlobalTXT_LocalizationStrings[429], v6->pName, aNPCProfessionNames[v8]); else strcpy(pTmpBuf, v6->pName); - a1.DrawText2(pFontCreate, 0x1E3u, 0x71u, v7, pTmpBuf, 3u); + a1.DrawTitleText(pFontCreate, 0x1E3u, 0x71u, v7, pTmpBuf, 3u); if ( !dword_591080 ) { if ( !uDialogueType ) @@ -10459,7 +10459,7 @@ v46 = v55; if ( (char *)pDialogueWindow->pCurrentPosActiveItem != pInString ) v46 = v54; - v52.DrawText2(pFontArrus, 0, v45, v46, v43, 3u); + v52.DrawTitleText(pFontArrus, 0, v45, v46, v43, 3u); v14 = pDialogueWindow; ++pInString; ++v56; @@ -11763,7 +11763,7 @@ if ( v72 ) { sprintf(pTmpBuf, pGlobalTXT_LocalizationStrings[401], v73);// "Skill Cost: %lu" - v65.DrawText2(pFontArrus, 0, 0x92u, 0, pTmpBuf, 3u); + v65.DrawTitleText(pFontArrus, 0, 0x92u, 0, pTmpBuf, 3u); v73 = (signed int)(149 - i) / v72; if ( v73 > 32 ) v73 = 32; @@ -11799,7 +11799,7 @@ v27 = v71; if ( pDialogueWindow->pCurrentPosActiveItem != v72 ) v27 = white; - v65.DrawText2(pFontArrus, 0, v25, v27, (char *)HIDWORD(v66), 3u); + v65.DrawTitleText(pFontArrus, 0, v25, v27, (char *)HIDWORD(v66), 3u); } v28 = v13->pStartingPosActiveItem; ++i; @@ -11818,7 +11818,7 @@ strcat(pTmpBuf, pGlobalTXT_LocalizationStrings[528]);// "I can offer you nothing further." v29 = v71; v30 = pFontArrus->CalcTextHeight(pTmpBuf, &v65, 0, 0); - result = (int)v65.DrawText2(pFontArrus, 0, (174 - v30) / 2 + 138, v29, pTmpBuf, 3u); + result = (int)v65.DrawTitleText(pFontArrus, 0, (174 - v30) / 2 + 138, v29, pTmpBuf, 3u); } } } @@ -11829,7 +11829,7 @@ v31 = pNPCTopics[122].pText; v32 = v71; v33 = pFontArrus->CalcTextHeight(pNPCTopics[122].pText, &v65, 0, 0); - v65.DrawText2(pFontArrus, 0, (212 - v33) / 2 + 101, v32, v31, 3u); + v65.DrawTitleText(pFontArrus, 0, (212 - v33) / 2 + 101, v32, v31, 3u); result = (int)pDialogueWindow; pDialogueWindow->pNumPresenceButton = 0; return result; @@ -11910,7 +11910,7 @@ v58 = v71; v36 = (212 - pFontArrus->CalcTextHeight(pTmpBuf, &v65, 0, 0)) / 2 + 101; } - v65.DrawText2(pFontArrus, v35, v36, v58, v60, v62); + v65.DrawTitleText(pFontArrus, v35, v36, v58, v60, v62); v63 = 3; goto LABEL_55; } @@ -11986,7 +11986,7 @@ v57 = v71; if ( pDialogueWindow->pCurrentPosActiveItem != i ) v57 = white; - v65.DrawText2(pFontArrus, 0, v55, v57, *v51, 3u); + v65.DrawTitleText(pFontArrus, 0, v55, v57, *v51, 3u); v43 = pDialogueWindow; ++i; ++v51; @@ -12186,7 +12186,7 @@ v87 = color2; if ( pDialogueWindow->pCurrentPosActiveItem != v86 ) v87 = white; - v112.DrawText2(pFontArrus, 0, v85, v87, *v119, 3u); + v112.DrawTitleText(pFontArrus, 0, v85, v87, *v119, 3u); v79 = pDialogueWindow; ++v122; ++v119; @@ -12248,7 +12248,7 @@ goto LABEL_61; } sprintf(pTmpBuf, pGlobalTXT_LocalizationStrings[401], v119);// "Skill Cost: %lu" - v112.DrawText2(pFontArrus, 0, 0x92u, 0, pTmpBuf, 3u); + v112.DrawTitleText(pFontArrus, 0, 0x92u, 0, pTmpBuf, 3u); v119 = (const char **)((149 - v118) / v122); if ( (149 - v118) / v122 > 32 ) v119 = (const char **)32; @@ -12285,7 +12285,7 @@ v47 = color2; if ( pDialogueWindow->pCurrentPosActiveItem != v45 ) v47 = white; - v112.DrawText2(pFontArrus, 0, v44, v47, Str, 3u); + v112.DrawTitleText(pFontArrus, 0, v44, v47, Str, 3u); } v48 = v31->pStartingPosActiveItem; ++v118; @@ -12370,7 +12370,7 @@ v26 = color2; if ( (const char **)pDialogueWindow->pCurrentPosActiveItem != v25 ) v26 = white; - v112.DrawText2(pFontArrus, 0, v24, v26, (const char *)LODWORD(_this->pConditions[0]), 3u); + v112.DrawTitleText(pFontArrus, 0, v24, v26, (const char *)LODWORD(_this->pConditions[0]), 3u); v17 = pDialogueWindow; v119 = (const char **)((char *)v119 + 1); _this = (Player *)((char *)_this + 4); @@ -12417,7 +12417,7 @@ v95 = v5; v92 = white; v6 = (212 - pFontArrus->CalcTextHeight(v5, &v112, 0, 0)) / 2 + 101; - return (int)v112.DrawText2(pFontArrus, v3, v6, v92, v95, v97); + return (int)v112.DrawTitleText(pFontArrus, v3, v6, v92, v95, v97); } v93 = ptr_507BC0->ptr_1C; v90 = (ItemGen *)v4; @@ -12465,7 +12465,7 @@ v88 = &v112; LABEL_61: v6 = (174 - pFontArrus->CalcTextHeight(v30, v88, v89, v91)) / 2 + 138; - return (int)v112.DrawText2(pFontArrus, v3, v6, v92, v95, v97); + return (int)v112.DrawTitleText(pFontArrus, v3, v6, v92, v95, v97); } } pRenderer->DrawTextureIndexed(8u, 8u, dword_F8B164); @@ -13214,7 +13214,7 @@ v39 = &v52; LABEL_32: v19 = pFontArrus->CalcTextHeight(v18, v39, v40, v41); - return (int)v52.DrawText2(pFontArrus, v5, (174 - v19) / 2 + 138, v42, v43, v44); + return (int)v52.DrawTitleText(pFontArrus, v5, (174 - v19) / 2 + 138, v42, v43, v44); } } return result; @@ -13226,7 +13226,7 @@ v36 = pNPCTopics[121].pText; v37 = v57; v38 = pFontArrus->CalcTextHeight(pNPCTopics[121].pText, &v52, 0, 0); - v52.DrawText2(pFontArrus, 0, (212 - v38) / 2 + 101, v37, v36, 3u); + v52.DrawTitleText(pFontArrus, 0, (212 - v38) / 2 + 101, v37, v36, 3u); result = (int)pDialogueWindow; pDialogueWindow->pNumPresenceButton = 0; return result; @@ -13290,7 +13290,7 @@ if ( Str ) { sprintf(pTmpBuf, pGlobalTXT_LocalizationStrings[401], v63); - v52.DrawText2(pFontArrus, 0, 0x92u, 0, pTmpBuf, 3u); + v52.DrawTitleText(pFontArrus, 0, 0x92u, 0, pTmpBuf, 3u); } v63 = (signed int)(149 - v62) / v61; if ( v63 > 32 ) @@ -13332,7 +13332,7 @@ v34 = v57; if ( pDialogueWindow->pCurrentPosActiveItem != v61 ) v34 = v56; - v52.DrawText2(pFontArrus, 0, v32, v34, Str, 3u); + v52.DrawTitleText(pFontArrus, 0, v32, v34, Str, 3u); goto LABEL_58; } v28->uW = 0; @@ -13480,7 +13480,7 @@ if ( v65 ) { sprintf(pTmpBuf, pGlobalTXT_LocalizationStrings[401], v64); - v57.DrawText2(pFontArrus, 0, 0x92u, 0, pTmpBuf, 3u); + v57.DrawTitleText(pFontArrus, 0, 0x92u, 0, pTmpBuf, 3u); v64 = (149 - (signed int)v66) / (signed int)v65; if ( v64 > 32 ) v64 = 32; @@ -13517,7 +13517,7 @@ v21 = WORD2(v59); if ( (DDM_DLV_Header *)pDialogueWindow->pCurrentPosActiveItem != v66 ) v21 = WORD2(v58); - v57.DrawText2(pFontArrus, 0, v19, v21, (const char *)HIDWORD(v60), 3u); + v57.DrawTitleText(pFontArrus, 0, v19, v21, (const char *)HIDWORD(v60), 3u); } result = (int)v61; ++v62; @@ -13536,7 +13536,7 @@ strcat(pTmpBuf, pGlobalTXT_LocalizationStrings[528]); v22 = WORD2(v59); v23 = pFontArrus->CalcTextHeight(pTmpBuf, &v57, 0, 0); - result = (int)v57.DrawText2(pFontArrus, 0, (174 - v23) / 2 + 138, v22, pTmpBuf, 3u); + result = (int)v57.DrawTitleText(pFontArrus, 0, (174 - v23) / 2 + 138, v22, pTmpBuf, 3u); } } } @@ -13732,7 +13732,7 @@ v53 = WORD2(v59); if ( (GUIWindow *)pDialogueWindow->pCurrentPosActiveItem != v61 ) v53 = WORD2(v58); - v57.DrawText2(pFontArrus, 0, v52, v53, (const char *)v66, 3u); + v57.DrawTitleText(pFontArrus, 0, v52, v53, (const char *)v66, 3u); v43 = pDialogueWindow; v66 = (DDM_DLV_Header *)((char *)v66 + 100); v61 = (GUIWindow *)((char *)v61 + 1); @@ -13947,7 +13947,7 @@ v24 = pNPCTopics[171].pText; v25 = v31; v26 = pFontArrus->CalcTextHeight(pNPCTopics[171].pText, &v28, 0, 0); - v28.DrawText2(pFontArrus, 0, (212 - v26) / 2 + 101, v25, v24, 3u); + v28.DrawTitleText(pFontArrus, 0, (212 - v26) / 2 + 101, v25, v24, 3u); result = (int)pDialogueWindow; pDialogueWindow->pNumPresenceButton = 0; return result; @@ -13985,10 +13985,10 @@ strcat(pTmpBuf, pGlobalTXT_LocalizationStrings[528]); v22 = v31; v23 = pFontArrus->CalcTextHeight(pTmpBuf, &v28, 0, 0); - return (int)v28.DrawText2(pFontArrus, 0, (174 - v23) / 2 + 138, v22, pTmpBuf, 3u); + return (int)v28.DrawTitleText(pFontArrus, 0, (174 - v23) / 2 + 138, v22, pTmpBuf, 3u); } sprintf(pTmpBuf, pGlobalTXT_LocalizationStrings[401], v32); - v28.DrawText2(pFontArrus, 0, 0x92u, 0, pTmpBuf, 3u); + v28.DrawTitleText(pFontArrus, 0, 0x92u, 0, pTmpBuf, 3u); v32 = (149 - v33) / v34; if ( (149 - v33) / v34 > 32 ) v32 = 32; @@ -14018,7 +14018,7 @@ v21 = v31; if ( pDialogueWindow->pCurrentPosActiveItem != v33 ) v21 = v30; - v28.DrawText2(pFontArrus, 0, v19, v21, v17, 3u); + v28.DrawTitleText(pFontArrus, 0, v19, v21, v17, 3u); goto LABEL_34; } } @@ -14259,7 +14259,7 @@ v44 = &v48; v43 = pTmpBuf2; sprintf(pTmpBuf, "%s\n \n%s%s%s%s%s", pTmpBuf2, &v48, &v49, &v50, &v51, &Dest); - v53.DrawText2(pFontArrus, 0, 0x92u, 0, pTmpBuf, 3u); + v53.DrawTitleText(pFontArrus, 0, 0x92u, 0, pTmpBuf, 3u); } else { @@ -14268,7 +14268,7 @@ v47[0] = pGlobalTXT_LocalizationStrings[561]; v46 = *(char **)v57; v45 = (174 - pFontArrus->CalcTextHeight(pGlobalTXT_LocalizationStrings[561], &v53, 0, 0)) / 2 + 138; - v53.DrawText2(pFontArrus, 0, v45, (unsigned __int16)v46, v47[0], (unsigned int)v47[1]); + v53.DrawTitleText(pFontArrus, 0, v45, (unsigned __int16)v46, v47[0], (unsigned int)v47[1]); pAudioPlayer->StopChannels(-1, -1); } }
--- a/mm7_5.cpp Wed Dec 12 16:36:45 2012 +0600 +++ b/mm7_5.cpp Wed Dec 12 17:07:27 2012 +0600 @@ -12528,11 +12528,11 @@ a1.uFrameZ = a1.uFrameX + a1.uFrameWidth - 1; a1.uFrameW = a1.uFrameHeight + a1.uFrameY - 1; v8 = GenerateColorAsCloseAsPossibleToR8G8B8InTargetFormat(0xFFu, 0xFFu, 0x9Bu); - a1.DrawText2(pFontArrus, 0x78u, 0xCu, v8, v7, 3u); + a1.DrawTitleText(pFontArrus, 0x78u, 0xCu, v8, v7, 3u); a1.DrawText(pFontSmallnum, 120, 44, 0, pTmpBuf2, 0, 0, 0); a1.uFrameWidth = 108; a1.uFrameZ = a1.uFrameX + 107; - a1.DrawText2(pFontComic, 0xCu, 0x4Bu, 0, pSkillNames[v1->pNumSpellBookPage + 12], 3u); + a1.DrawTitleText(pFontComic, 0xCu, 0x4Bu, 0, pSkillNames[v1->pNumSpellBookPage + 12], 3u); sprintf( pTmpBuf, "%s\n%d", @@ -12540,7 +12540,7 @@ *(&pSpellDatas[0].field_14 + ((unsigned int)LOBYTE(v1->pActiveSkills[v1->pNumSpellBookPage + 12]) >> 6) + 10 * (int)((char *)v10 + 11 * v1->pNumSpellBookPage))); - a1.DrawText2(pFontComic, 0xCu, a1.uFrameHeight - LOBYTE(pFontComic->uFontHeight) - 16, 0, pTmpBuf, 3u); + a1.DrawTitleText(pFontComic, 0xCu, a1.uFrameHeight - LOBYTE(pFontComic->uFontHeight) - 16, 0, pTmpBuf, 3u); dword_507B00_spell_info_to_draw_in_popup = 0; } // 507B00: using guessed type int dword_507B00_spell_info_to_draw_in_popup; @@ -12619,7 +12619,7 @@ if ( !bRecallingBeacon ) v1 = pGlobalTXT_LocalizationStrings[375]; // Set Beacon sprintf(pTmpBuf, "%s", v1); - v22.DrawText2(pBook2Font, 0, 22u, 0, pTmpBuf, 3u); + v22.DrawTitleText(pBook2Font, 0, 22u, 0, pTmpBuf, 3u); if ( bRecallingBeacon ) { pRenderer->DrawTextureTransparent(pBtn_Book_1->uX, pBtn_Book_1->uY, pTex_tab_an_6b__zoom_on); @@ -12691,7 +12691,7 @@ Str = pMapStats->pInfos[sub_410D99_get_map_index(HIWORD(v28->field_18))].pName; v8 = pSpellFont->CalcTextHeight(Str, &v22, 0, 0); v22.uFrameY += -6 - v8; - v22.DrawText2(pSpellFont, 0, 0, 1u, Str, 3u); + v22.DrawTitleText(pSpellFont, 0, 0, 1u, Str, 3u); v9 = v7->uBeaconTime - pParty->uTimePlayed; LODWORD(v24) = LODWORD(v7->uBeaconTime) - LODWORD(pParty->uTimePlayed); HIDWORD(v24) = HIDWORD(v9); @@ -12714,7 +12714,7 @@ v22.uFrameY = v25 + v22.uFrameHeight + 4; v15 = 0; LABEL_28: - v22.DrawText2(pSpellFont, 0, v15, v16, v18, v21); + v22.DrawTitleText(pSpellFont, 0, v15, v16, v18, v21); goto LABEL_29; } } @@ -12824,14 +12824,14 @@ v2 = pMouse->GetCursorPos(&a2); v3 = pRenderer->pActiveZBuffer[v2->x + pSRZBufferLineOffsets[pMouse->GetCursorPos(&v7)->y]] & 0xFFFF; if ( !v3 ) // Town Portal - return v6.DrawText2(pBook2Font, 0, 22u, 0, pGlobalTXT_LocalizationStrings[10], 3u); + return v6.DrawTitleText(pBook2Font, 0, 22u, 0, pGlobalTXT_LocalizationStrings[10], 3u); if ( v3 == 1 ) { v4 = 206; LABEL_30: if ( (unsigned __int16)_449B57_test_bit(pParty->_award_bits, v4) ) goto LABEL_31; - return v6.DrawText2(pBook2Font, 0, 22u, 0, pGlobalTXT_LocalizationStrings[10], 3u); + return v6.DrawTitleText(pBook2Font, 0, 22u, 0, pGlobalTXT_LocalizationStrings[10], 3u); } if ( v3 == 2 ) { @@ -12860,7 +12860,7 @@ } LABEL_31: pRenderer->DrawTextureIndexed(word_4E1D3A[v3], pTownPortalBook_xs[v3 + 5], *(&pTex_tab_an_6b__zoom_on + v3)); - return v6.DrawText2(pBook2Font, 0, 22u, 0, pGlobalTXT_LocalizationStrings[10], 3u); + return v6.DrawTitleText(pBook2Font, 0, 22u, 0, pGlobalTXT_LocalizationStrings[10], 3u); } // 4E1D3A: using guessed type __int16 word_4E1D3A[]; @@ -13276,7 +13276,7 @@ a1.uFrameZ = 467; a1.uFrameW = 351; if ( v3 ) - a1.DrawText2(pBook2Font, 0, 0x16u, 0, v3, 3u); + a1.DrawTitleText(pBook2Font, 0, 0x16u, 0, v3, 3u); } a1.uFrameX = 48; a1.uFrameY = 70; @@ -13376,7 +13376,7 @@ a1.uFrameY = 8; a1.uFrameZ = 467; a1.uFrameW = 351; - a1.DrawText2(pBook2Font, 0, 0x16u, 0, pGlobalTXT_LocalizationStrings[174], 3u); + a1.DrawTitleText(pBook2Font, 0, 0x16u, 0, pGlobalTXT_LocalizationStrings[174], 3u); a1.uFrameX = 48; a1.uFrameY = 70; a1.uFrameWidth = 360; @@ -13640,7 +13640,7 @@ a1.uFrameY = 8; a1.uFrameZ = 467; a1.uFrameW = 467; - a1.DrawText2(pBook2Font, 0, 0x16u, 0, pGlobalTXT_LocalizationStrings[154], 3u); + a1.DrawTitleText(pBook2Font, 0, 0x16u, 0, pGlobalTXT_LocalizationStrings[154], 3u); a1.uFrameX = 48; a1.uFrameY = 70; a1.uFrameWidth = 360; @@ -13864,10 +13864,10 @@ v22.uFrameW = 467; v7 = pMapStats->GetMapInfo(pCurrentMapName); if ( v7 ) - v22.DrawText2(pBook2Font, 0xFFFFFFF2u, 0xCu, 0, pMapStats->pInfos[v7].pName, 3u); + v22.DrawTitleText(pBook2Font, 0xFFFFFFF2u, 0xCu, 0, pMapStats->pInfos[v7].pName, 3u); v22.uFrameX = 0; sprintf(Str, pGlobalTXT_LocalizationStrings[659], pParty->vPosition.x, pParty->vPosition.y); - return v22.DrawText2(pFontComic, 0, 0x140u, 0, Str, 0); + return v22.DrawTitleText(pFontComic, 0, 0x140u, 0, Str, 0); } @@ -13954,7 +13954,7 @@ a1.uFrameHeight = 344; a1.uFrameZ = 467; a1.uFrameW = 467; - a1.DrawText2(pBook2Font, 0, 0x16u, 0, pGlobalTXT_LocalizationStrings[186], 3u); + a1.DrawTitleText(pBook2Font, 0, 0x16u, 0, pGlobalTXT_LocalizationStrings[186], 3u); v1 = GetDayPart(); sprintf( pTmpBuf, @@ -14427,7 +14427,7 @@ v3.uFrameZ = 232; v3.uFrameW = 268; v1 = GenerateColorAsCloseAsPossibleToR8G8B8InTargetFormat(0xFFu, 0xFFu, 0x9Bu); - v3.DrawText2(pFontSmallnum, 0, 0, v1, v0, 3u); + v3.DrawTitleText(pFontSmallnum, 0, 0, v1, v0, 3u); } if ( !pRenderer->pRenderD3D ) { @@ -14669,7 +14669,7 @@ Dst.uFrameHeight -= 12; Dst.uFrameZ = Dst.uFrameX + Dst.uFrameWidth - 1; Dst.uFrameW = Dst.uFrameY + Dst.uFrameHeight - 1; - return Dst.DrawText2(pFontSmallnum, 0, 0xCu, 0, pGlobalTXT_LocalizationStrings[157], 3u); + return Dst.DrawTitleText(pFontSmallnum, 0, 0xCu, 0, pGlobalTXT_LocalizationStrings[157], 3u); } @@ -15760,7 +15760,7 @@ strcpy(pTmpBuf, v12); } v13 = GenerateColorAsCloseAsPossibleToR8G8B8InTargetFormat(0xFFu, 0xFFu, 0x9Bu); - a1.DrawText2(pFontArrus, 0, 0xCu, v13, v11, 3u); + a1.DrawTitleText(pFontArrus, 0, 0xCu, v13, v11, 3u); a1.uFrameWidth -= 24; a1.uFrameZ = a1.uFrameX + a1.uFrameWidth - 1; v14 = sub_495461((char *)lpsz, uActiveCharacter - 1, 0, 0, 0, 0); @@ -16175,7 +16175,7 @@ pWindow.uFrameW = pWindow.uFrameY + pWindow.uFrameHeight - 1; v25 = GenerateColorAsCloseAsPossibleToR8G8B8InTargetFormat(0xFF, 0xFF, 0x9B); sprintf(pTmpBuf, format_4E2D80, v25, pStr); - pWindow.DrawText2(pFontCreate, 0, 0, 0, pTmpBuf, 3); + pWindow.DrawTitleText(pFontCreate, 0, 0, 0, pTmpBuf, 3); pWindow.DrawText(pFontSmallnum, 1, LOBYTE(pFontLucida->uFontHeight), 0, v23, 0, 0, 0); } LABEL_132: @@ -16466,7 +16466,7 @@ Dst.uFrameW = Dst.uFrameY + Dst.uFrameHeight - 1; v4 = GenerateColorAsCloseAsPossibleToR8G8B8InTargetFormat(0xFFu, 0xFFu, 0x9Bu); sprintf(pTmpBuf, format_4E2D80, v4, v3); - Dst.DrawText2(pFontCreate, 0, 0, 0, pTmpBuf, 3u); + Dst.DrawTitleText(pFontCreate, 0, 0, 0, pTmpBuf, 3u); return Dst.DrawText(pFontSmallnum, 1, LOBYTE(pFontLucida->uFontHeight), 0, v2, 0, 0, 0); }