# HG changeset patch # User Gloval # Date 1363382715 -14400 # Node ID 26dfde53decdc8cb294e3d21ea70255459b51c7a # Parent c89e0b2d8ea6013eb29eb9e58914c901f7d20d79 ui fixing diff -r c89e0b2d8ea6 -r 26dfde53decd UIHouses.cpp --- a/UIHouses.cpp Sat Mar 16 01:12:03 2013 +0400 +++ b/UIHouses.cpp Sat Mar 16 01:25:15 2013 +0400 @@ -1038,13 +1038,13 @@ if ( !sub_4B1784_check_if_player_concious__draw_warning_else_mess_with_dlg_win() ) return; - sprintf(Dest, "\xC" "%05d", pDialogueWindow->pCurrentPosActiveItem == 2 ? pColorYellow : pColorWhite); + sprintf(Dest, "\f%05d", pDialogueWindow->pCurrentPosActiveItem == 2 ? pColorYellow : pColorWhite); sprintfex(pTmpBuf2, pGlobalTXT_LocalizationStrings[178], pOutString); // Rent room for %d gold strcat(Dest, pTmpBuf2); pTextHeight = pFontArrus->CalcTextHeight(Dest, &dialog_window, 0, 0); strcat(Dest, "\n \n"); - sprintf(a1, "\xC" "%05d", pDialogueWindow->pCurrentPosActiveItem == 3 ? pColorYellow : pColorWhite); + sprintf(a1, "\f%05d", pDialogueWindow->pCurrentPosActiveItem == 3 ? pColorYellow : pColorWhite); sprintfex(pTmpBuf2, pGlobalTXT_LocalizationStrings[86], // Buy food for %d days for %d gold (unsigned int)p2DEvents[(unsigned int)window_SpeakInHouse->ptr_1C - 1].fPriceMultiplier, v83); @@ -1052,15 +1052,15 @@ v88 = pFontArrus->CalcTextHeight(a1, &dialog_window, 0, 0); strcat(a1, "\n \n"); - sprintf(v77, "\xC" "%05d", pDialogueWindow->pCurrentPosActiveItem == 4 ? pColorYellow : pColorWhite); + sprintf(v77, "\f%05d", pDialogueWindow->pCurrentPosActiveItem == 4 ? pColorYellow : pColorWhite); strcat(v77, pGlobalTXT_LocalizationStrings[160]); // Learn Skills v82 = pFontArrus->CalcTextHeight(v77, &dialog_window, 0, 0); strcat(v77, "\n \n"); v75[0] = 0; pTextHeight = 0; - if ( (signed int)window_SpeakInHouse->ptr_1C >= 108 && (signed int)window_SpeakInHouse->ptr_1C <= 120 ) + if ( (signed int)window_SpeakInHouse->par1C >= 108 && (signed int)window_SpeakInHouse->par1C <= 120 ) { - sprintf(v75, "\xC" "%05d", pDialogueWindow->pCurrentPosActiveItem == 5 ? pColorYellow : pColorWhite); + sprintf(v75, "\f%05d", pDialogueWindow->pCurrentPosActiveItem == 5 ? pColorYellow : pColorWhite); strcat(v75, pGlobalTXT_LocalizationStrings[611]); // Play Arcomage pTextHeight = pFontArrus->CalcTextHeight(v75, &dialog_window, 0, 0); } diff -r c89e0b2d8ea6 -r 26dfde53decd mm7_1.cpp --- a/mm7_1.cpp Sat Mar 16 01:12:03 2013 +0400 +++ b/mm7_1.cpp Sat Mar 16 01:25:15 2013 +0400 @@ -1169,7 +1169,7 @@ v39 = v46; v40 = GetReputationString(v38); - sprintf(pTmpBuf, "%s: \xC" "%05d%s\xC" "00000", pGlobalTXT_LocalizationStrings[180], v39, v40);//Reputation + sprintf(pTmpBuf, "%s: \f%05d%s\f00000", pGlobalTXT_LocalizationStrings[180], v39, v40);//Reputation pGUIWindow_CurrentMenu->DrawText(pFontArrus, 22, 323, 0, pTmpBuf, 0, 0, 0); v41 = pParty->GetPartyFame(); sprintf(pTmpBuf, "\r261%s: %d", pGlobalTXT_LocalizationStrings[84], v41);// Fame Слава diff -r c89e0b2d8ea6 -r 26dfde53decd mm7_4.cpp --- a/mm7_4.cpp Sat Mar 16 01:12:03 2013 +0400 +++ b/mm7_4.cpp Sat Mar 16 01:25:15 2013 +0400 @@ -11445,7 +11445,7 @@ if ( pDialogueWindow->pCurrentPosActiveItem != s1 ) v27 = (const char *)v57; //v32.uRedbookTrackID = v27; - sprintf(a1, "\xC" "%05d", v27); + sprintf(a1, "\f%05d", v27); v66 = (unsigned __int8)byte_4F09B8[v26 * 4]; if ( (signed int)window_SpeakInHouse->ptr_1C >= 63 ) { diff -r c89e0b2d8ea6 -r 26dfde53decd mm7_5.cpp --- a/mm7_5.cpp Sat Mar 16 01:12:03 2013 +0400 +++ b/mm7_5.cpp Sat Mar 16 01:25:15 2013 +0400 @@ -16605,21 +16605,21 @@ { strcpy(a2, "%s\n\n"); v24 = GetSkillColor(pPlayer->classType, uPlayerSkillType, 1); - sprintf(Source, "\xC" "%05d", v24); + sprintf(Source, "\f%05d", v24); strcat(a2, Source); strcat(a2, "%s\t%03d:\t%03d%s\t000\n"); v25 = GetSkillColor(pPlayer->classType, uPlayerSkillType, 2); - sprintf(Source, "\xC" "%05d", v25); + sprintf(Source, "\f%05d", v25); strcat(a2, Source); strcat(a2, "%s\t%03d:\t%03d%s\t000\n"); v26 = GetSkillColor(pPlayer->classType, uPlayerSkillType, 3); - sprintf(Source, "\xC" "%05d", v26); + sprintf(Source, "\f%05d", v26); strcat(a2, Source); strcat(a2, "%s\t%03d:\t%03d%s\t000\n"); v27 = pPlayer->classType; v28 = uPlayerSkillType; v29 = GetSkillColor(v27, uPlayerSkillType, 4); - sprintf(Source, "\xC" "%05d", v29); + sprintf(Source, "\f%05d", v29); strcat(a2, Source); strcat(a2, "%s\t%03d:\t%03d%s\t000\n"); @@ -16634,24 +16634,24 @@ { strcpy(a2, "%s\n\n"); v9 = GetSkillColor(pPlayer->classType, uPlayerSkillType, 1); - sprintf(Source, "\xC" "%05d", v9); + sprintf(Source, "\f%05d", v9); strcat(a2, Source); strcat(a2, "%s\t%03d:\t%03d%s\t000\n"); v10 = GetSkillColor(pPlayer->classType, uPlayerSkillType, 2); - sprintf(Source, "\xC" "%05d", v10); + sprintf(Source, "\f%05d", v10); strcat(a2, Source); strcat(a2, "%s\t%03d:\t%03d%s\t000\n"); v11 = GetSkillColor(pPlayer->classType, uPlayerSkillType, 3); - sprintf(Source, "\xC" "%05d", v11); + sprintf(Source, "\f%05d", v11); strcat(a2, Source); strcat(a2, "%s\t%03d:\t%03d%s\t000\n"); v12 = uPlayerSkillType; v13 = GetSkillColor(pPlayer->classType, uPlayerSkillType, 4); - sprintf(Source, "\xC" "%05d", v13); + sprintf(Source, "\f%05d", v13); strcat(a2, Source); strcat(a2, "%s\t%03d:\t%03d%s\t000\n\n"); v14 = GenerateColorAsCloseAsPossibleToR8G8B8InTargetFormat(0xFFu, 0xFFu, 0xFFu); - sprintf(Source, "\xC" "%05d", v14); + sprintf(Source, "\f%05d", v14); strcat(a2, Source); strcat(a2, "%s: +%d"); v15 = v12; @@ -17103,14 +17103,14 @@ v2 = pIcons_LOD->LoadTexture("fr_stats", TEXTURE_16BIT_PALETTE); pRenderer->DrawTextureIndexed(8, 8, (Texture *)(v2 != -1 ? (int)&pIcons_LOD->pTextures[v2] : 0)); v3 = GenerateColorAsCloseAsPossibleToR8G8B8InTargetFormat(0xFFu, 0xFFu, 0x9Bu); - sprintf(pTmpBuf, "\xC" "%05d", v3); + sprintf(pTmpBuf, "\f%05d", v3); sprintf(pTmpBuf2, pGlobalTXT_LocalizationStrings[429], pPlayer->pName, pClassNames[pPlayer->classType]);//^Pi[%s] %s strcat(pTmpBuf, pTmpBuf2); if ( pPlayer->uSkillPoints ) v4 = GenerateColorAsCloseAsPossibleToR8G8B8InTargetFormat(0, 0xFFu, 0); else v4 = 0xFFFFu; - sprintf(pTmpBuf2, "\xC" "00000\xD" "180%s: \xC%05d%d\xC" "00000\n\n\n", pGlobalTXT_LocalizationStrings[207], v4, pPlayer->uSkillPoints);//Skill points + sprintf(pTmpBuf2, "\f00000\r180%s: \f%05d%d\f00000\n\n\n", pGlobalTXT_LocalizationStrings[207], v4, pPlayer->uSkillPoints);//Skill points strcat(pTmpBuf, pTmpBuf2); pGUIWindow_CurrentMenu->DrawText(pFontArrus, 26, 18, 0, pTmpBuf, 0, 0, 0); v5 = pPlayer->GetBaseStrength();