Mercurial > mm7
changeset 1168:8b3e7d5ba069
fonts all cleaned
| author | Gloval |
|---|---|
| date | Wed, 05 Jun 2013 01:00:40 +0400 |
| parents | 15ad868d972f |
| children | b542660e7302 |
| files | GUIFont.cpp GUIFont.h UIMainMenu.cpp UIPartyCreation.cpp |
| diffstat | 4 files changed, 177 insertions(+), 264 deletions(-) [+] |
line wrap: on
line diff
--- a/GUIFont.cpp Tue Jun 04 18:29:35 2013 +0200 +++ b/GUIFont.cpp Wed Jun 05 01:00:40 2013 +0400 @@ -64,74 +64,58 @@ //----- (0044D2FD) -------------------------------------------------------- -void GUIFont::_44D2FD_prolly_draw_credits_entry(GUIFont *pFont, int Str, int a4, unsigned int w, unsigned int h, - unsigned __int16 a7, unsigned __int16 a8, const char *pString, - unsigned __int16 *pPixels, unsigned int uPixelsWidth) -{ - int v11; // ebx@1 - int v12; // edi@1 - char *v13; // eax@1 - char *v14; // eax@1 - unsigned __int16 *v15; // esi@1 - GUIFont *v16; // edi@4 - signed int v17; // ecx@4 - signed int v18; // eax@6 - int v19; // [sp+Ch] [bp-5Ch]@1 - int v20; // [sp+10h] [bp-58h]@1 - unsigned int v21; // [sp+14h] [bp-54h]@1 - unsigned int v22; // [sp+18h] [bp-50h]@1 - unsigned int v23; // [sp+1Ch] [bp-4Ch]@1 - unsigned int v24; // [sp+20h] [bp-48h]@1 - GUIFont *v25; // [sp+60h] [bp-8h]@1 - GUIFont *v26; // [sp+64h] [bp-4h]@1 - char *Stra; // [sp+70h] [bp+8h]@1 - int a4a; // [sp+74h] [bp+Ch]@4 - int a7a; // [sp+80h] [bp+18h]@2 +void GUIFont::_44D2FD_prolly_draw_credits_entry( GUIFont *pSecondFont, int uFrameX, int uFrameY, unsigned int w, unsigned int h, + unsigned __int16 firstColor, unsigned __int16 secondColor, const char *pString, + unsigned __int16 *pPixels, unsigned int uPixelsWidth ) + { + char *work_string; // eax@1 + unsigned __int16 *curr_pixel_pos; // esi@1 + GUIFont *currentFont; // edi@4 + signed int start_str_pos; // ecx@4 + signed int line_w; // eax@6 + GUIWindow draw_window; // [sp+Ch] [bp-5Ch]@ + int currentColor; // [sp+74h] [bp+Ch]@4 + int half_frameX; // [sp+80h] [bp+18h]@2 - v11 = a7; - v22 = h; - v12 = Str; - v26 = this; - v24 = a4 + h - 1; - v21 = w; - v25 = pFont; - v23 = Str + w - 1; - ui_current_text_color = a7; - v19 = Str; - v20 = a4; - v13 = GUIFont::_44C933(pString, this, pFont, (int)&v19, 0, 1); - v14 = strtok(v13, "\n"); - Stra = v14; - v15 = &pPixels[uPixelsWidth * a4]; - if ( v14 ) + draw_window.uFrameHeight = h; + draw_window.uFrameW = uFrameY + h - 1; + draw_window.uFrameWidth = w; + draw_window.uFrameZ = uFrameX + w - 1; + ui_current_text_color = firstColor; + draw_window.uFrameX = uFrameX; + draw_window.uFrameY = uFrameY; + + work_string = GUIFont::FitTwoFontStringINWindow(pString, this, pSecondFont, &draw_window, 0, 1); + work_string = strtok(work_string, "\n"); + curr_pixel_pos = &pPixels[uPixelsWidth * uFrameY]; + if ( work_string ) { - a7a = v12 >> 1; + half_frameX = uFrameX >> 1; while ( 1 ) { - v16 = v26; - ui_current_text_color = v11; - v17 = 0; - a4a = v11; - if ( *v14 == '_' ) + currentFont = this; + ui_current_text_color = firstColor; + start_str_pos = 0; + currentColor = firstColor; + if ( *work_string == '_' ) { - v16 = v25; - a4a = a8; - ui_current_text_color = a8; - v17 = 1; + currentFont = pSecondFont; + currentColor = secondColor; + ui_current_text_color = secondColor; + start_str_pos = 1; } - v18 = (signed int)(w - v16->GetLineWidth(&v14[v17])) >> 1; - if ( v18 < 0 ) - v18 = 0; - v16->DrawTextLineToBuff(a4a, a8, &v15[v18 + a7a], Stra, uPixelsWidth); - v15 += uPixelsWidth * (LOBYTE(v16->uFontHeight) - 3); - Stra = strtok(0, "\n"); - if ( !Stra ) + line_w = (signed int)(w - currentFont->GetLineWidth(&work_string[start_str_pos]))/2; + if ( line_w < 0 ) + line_w = 0; + currentFont->DrawTextLineToBuff(currentColor, secondColor, &curr_pixel_pos[line_w + half_frameX], work_string, uPixelsWidth); + curr_pixel_pos += uPixelsWidth * (currentFont->uFontHeight - 3); + work_string = strtok(0, "\n"); + if ( !work_string ) break; - v14 = Stra; } } } -// 5C6DB4: using guessed type int ui_current_text_color; + //----- (0044D1E7) -------------------------------------------------------- @@ -258,7 +242,7 @@ i += 5; break; case '\t': // Horizontal tab 09 - case '\r': //Carriage Return 0D 13 + case '_': break; default: uCharWidth = pMetrics[c].uWidth; @@ -283,192 +267,120 @@ //----- (0044C933) -------------------------------------------------------- -char * GUIFont::_44C933(const char *pString, GUIFont *pFont, GUIFont *a3, int a4, int a5, int a6) -{ - const char *v6; // esi@1 - size_t v8; // eax@3 - size_t v9; // edi@3 - int v10; // eax@3 - GUIFont *v11; // esi@3 - int v12; // ebx@3 - char v13; // cl@5 - int v14; // edx@11 - int v15; // ecx@11 - int v16; // edx@12 - int v17; // edx@13 - int v18; // edx@14 - int v19; // edx@15 - int v20; // edi@17 - int v21; // edx@17 - int v22; // ecx@17 - int v23; // edi@18 - char v24; // zf@18 - int v25; // ecx@19 - int v26; // eax@19 - char v27; // dl@24 - int v28; // eax@46 - std::string v29; // [sp-18h] [bp-48h]@2 - const char *v30; // [sp-8h] [bp-38h]@2 - int v31; // [sp-4h] [bp-34h]@2 - const char *v32; // [sp+Ch] [bp-24h]@1 - char Str; // [sp+10h] [bp-20h]@46 - char v34; // [sp+13h] [bp-1Dh]@46 - GUIFont *v35; // [sp+14h] [bp-1Ch]@1 - int v36; // [sp+18h] [bp-18h]@3 - int v37; // [sp+1Ch] [bp-14h]@3 - int v38; // [sp+20h] [bp-10h]@4 - int v39; // [sp+24h] [bp-Ch]@3 - int v40; // [sp+28h] [bp-8h]@3 - int i; // [sp+2Ch] [bp-4h]@17 - std::string *v42; // [sp+38h] [bp+8h]@2 +char * GUIFont::FitTwoFontStringINWindow( const char *pString, GUIFont *pFontMain, GUIFont *pFontSecond, GUIWindow* pWindow, int startPixlOff, int a6 ) + { + + GUIFont *currentFont; // esi@3 + unsigned char c; + int uInStrLen; + char digits[4]; + int possible_transition_point; + int string_pixel_Width; + int start_pixel_offset; + + if (!pString) + { + MessageBoxW(nullptr, L"Invalid string passed !", L"E:\\WORK\\MSDEV\\MM7\\MM7\\Code\\Font.cpp:445", 0); + return 0; + } + currentFont=pFontMain; // esi@3 + uInStrLen = strlen(pString); + assert(uInStrLen < sizeof(pTmpBuf3)); + strcpy(pTmpBuf3, pString); + if (uInStrLen==0) + return pTmpBuf3; - v6 = pString; - v35 = pFont; - v32 = pString; - if ( !pString ) - { - MessageBoxW(nullptr, L"Invalid string passed !", L"E:\\WORK\\MSDEV\\MM7\\MM7\\Code\\Font.cpp:558", 0); - return 0; - } - v8 = strlen(pString); - v9 = v8; - v39 = v8; + start_pixel_offset=string_pixel_Width=startPixlOff; + possible_transition_point=0; + for(int i=0; i<uInStrLen; ++i) + { + c=pTmpBuf3[i]; + if (pFontMain->IsCharValid(c)) + { + switch (c) + { + case '\t': // Horizontal tab 09 + { + strncpy(digits, &pTmpBuf3[i+1],3); + digits[3]=0; + string_pixel_Width = atoi(digits)+startPixlOff; + i+=3; + break; + } + case '\n': //Line Feed 0A 10 + { + string_pixel_Width=start_pixel_offset; + possible_transition_point=i; + currentFont=pFontMain; + break; + } + case '\f': //Form Feed, page eject 0C 12 + { + i+=5; + break; + } + case '\r': //Carriage Return 0D 13 + { + if (!a6) + return (char*)pString; + break; + } + case ' ' : + { + string_pixel_Width+=currentFont->pMetrics[c].uWidth; + possible_transition_point=i; + break; + } + case '_' : + currentFont=pFontSecond; + break; + default: - assert(strlen(v6) < sizeof(pTmpBuf3)); - strcpy(pTmpBuf3, v6); - v10 = a5; - v11 = v35; - v12 = 0; - v40 = 0; - v37 = a5; - v36 = 0; - if ( (signed int)v9 > 0 ) - { - v38 = v9 - 1; - do - { - v13 = pTmpBuf3[v12]; - if ( (unsigned __int8)v13 >= v11->cFirstChar && (unsigned __int8)v13 <= v11->cLastChar - || v13 == '\f' - || v13 == '\r' - || v13 == '\t' - || v13 == '\n' ) - { - v14 = (unsigned __int8)v13 - 9; - v15 = (int)&v11->pMetrics[(unsigned __int8)v13]; - if ( v14 ) - { - v16 = v14 - 1; - if ( v16 ) - { - v17 = v16 - 2; - if ( v17 ) - { - v18 = v17 - 1; - if ( v18 ) - { - v19 = v18 - 19; - if ( v19 ) - { - if ( v19 == 63 ) - { - v11 = a3; - } - else + if ((string_pixel_Width+currentFont->pMetrics[c].uWidth+ currentFont->pMetrics[c].uLeftSpacing+ + currentFont->pMetrics[c].uRightSpacing)<pWindow->uFrameWidth) { - v20 = *(int *)(v15 + 8); - v21 = *(int *)(v15 + 4); - v22 = *(int *)v15; - i = v20; - if ( (unsigned int)(v10 + v20 + v22 + v21) < *(int *)(a4 + 8) ) - { - v12 = v36; - if ( v36 > v40 ) - v10 += v22; - v10 += v21; - if ( v36 < v39 ) - v10 += i; - } - else - { - v23 = v40; - v24 = v11 == a3; - pTmpBuf3[v40] = 10; - if ( v24 ) - { - v25 = v38; - v26 = v23 + 1; - while ( v25 >= v26 ) - { - pTmpBuf3[v25] = byte_5C45AF[v25]; - --v25; - } - ++v39; - ++v38; - pTmpBuf3[v23++ + 1] = 95; - v40 = v26; - } - v12 = v36; - v10 = v37; - for ( i = v23; i <= v36; ++i ) + if(i>possible_transition_point) + string_pixel_Width+=currentFont->pMetrics[c].uLeftSpacing; + string_pixel_Width+=currentFont->pMetrics[c].uWidth; + if (i<uInStrLen) + string_pixel_Width+=currentFont->pMetrics[c].uRightSpacing; + } + else + { + pTmpBuf3[possible_transition_point]='\n'; + + if ( currentFont== pFontSecond) { - v27 = pTmpBuf3[i]; - if ( (unsigned __int8)v27 >= v11->cFirstChar && (unsigned __int8)v27 <= v11->cLastChar - || v27 == 12 - || v27 == 13 - || v27 == 9 - || v27 == 10 ) - { - if ( i > v23 ) - v10 += v11->pMetrics[(unsigned __int8)v27].uLeftSpacing; - v10 += *((int *)&v11->cFirstChar + 3 * (unsigned __int8)v27 + 9); - if ( i < v36 ) - v10 += v11->pMetrics[(unsigned __int8)v27].uRightSpacing; - } + + for(int k=uInStrLen-1; k>=possible_transition_point+1; --k) + pTmpBuf3[k] = pTmpBuf3[k-1]; + + ++uInStrLen; + ++possible_transition_point; + pTmpBuf3[possible_transition_point] = '_'; + } - } + string_pixel_Width=start_pixel_offset; + + for(int j=possible_transition_point;j<i; ++j ) + { + c=pTmpBuf3[j]; + if (pFontMain->IsCharValid(c)) + { + if(j>possible_transition_point) + string_pixel_Width+=pFontMain->pMetrics[c].uLeftSpacing; + string_pixel_Width+=pFontMain->pMetrics[c].uWidth; + if (j<i) + string_pixel_Width+=pFontMain->pMetrics[c].uRightSpacing; + + } + } } - } - else - { - v10 += *(int *)(v15 + 4); - v40 = v12; - } - } - else - { - if ( !a6 ) - return (char *)v32; } - } - else - { - v12 += 5; - } } - else - { - v10 = v37; - v11 = v35; - v40 = v12; - } - } - else - { - strncpy(&Str, &pTmpBuf3[v12 + 1], 3u); - v34 = 0; - v28 = atoi(&Str); - v10 = a5 + v28; - v12 += 3; - v37 = v10; - } } - ++v12; - v36 = v12; - } - while ( v12 < v39 ); - } return pTmpBuf3; + } @@ -517,18 +429,18 @@ //----- (0044C62E) -------------------------------------------------------- -int GUIFont::GetStringHeight2(GUIFont *a2, const char *Str, int a4, int a5, int a6) -{ +int GUIFont::GetStringHeight2( GUIFont *secondFont, const char *text_str, GUIWindow* pWindow, int startX, int a6 ) + { int uAllHeght; int uStringLen; unsigned char c; char *test_string; - if ( !Str ) + if ( !text_str ) return 0; - uAllHeght = this->uFontHeight - 3; - test_string = GUIFont::_44C933(Str, this, a2, a4, a5, 0); + uAllHeght = uFontHeight - 3; + test_string = FitTwoFontStringINWindow(text_str, this, secondFont, pWindow, startX, 0); uStringLen = strlen(test_string); for (int i = 0; i < uStringLen; ++i) { @@ -538,7 +450,7 @@ switch (c) { case '\n': //Line Feed 0A 10: - uAllHeght+= this->uFontHeight - 3; + uAllHeght+= uFontHeight - 3; break; case '\f': //Form Feed, page eject 0C 12 i += 5; @@ -565,7 +477,7 @@ if (!pString) return 0; - uAllHeght = this->uFontHeight - 3; + uAllHeght = uFontHeight - 3; test_string = FitTextInAWindow(pString, this, pWindow, uXOffset, 0); uStringLen = strlen(pString); for (int i = 0; i < uStringLen; ++i) @@ -576,7 +488,7 @@ switch (c) { case '\n': //Line Feed 0A 10: - uAllHeght+= this->uFontHeight - 3; + uAllHeght+= uFontHeight - 3; break; case '\f': //Form Feed, page eject 0C 12 i += 5; @@ -620,10 +532,10 @@ break; default: if (i > 0) - string_line_width += this->pMetrics[c].uLeftSpacing; - string_line_width += this->pMetrics[c].uWidth; + string_line_width += pMetrics[c].uLeftSpacing; + string_line_width += pMetrics[c].uWidth; if (i < str_len) - string_line_width +=this->pMetrics[c].uRightSpacing; + string_line_width +=pMetrics[c].uRightSpacing; } } }
--- a/GUIFont.h Tue Jun 04 18:29:35 2013 +0200 +++ b/GUIFont.h Wed Jun 05 01:00:40 2013 +0400 @@ -21,13 +21,15 @@ int AlignText_Center(unsigned int uCenterX, const char *pString); int GetLineWidth(const char *pString); int CalcTextHeight(const char *pString, struct GUIWindow *pWindow, int uXOffset, int a5); - int GetStringHeight2(GUIFont *a2, const char *Str, int a4, int a5, int a6); + int GetStringHeight2(GUIFont *secondFont, const char *text_str, GUIWindow* pWindow, int startX, int a6); char* _44C6C2(const char *pInString, GUIWindow *pWindow, unsigned int uX, int a5); void DrawTextLineToBuff(int uColor, int a3, unsigned short* uX_buff_pos, const char *text, int line_width); void DrawTextLine(unsigned int uDefaultColor, signed int uX, signed int uY, const char *text, int max_len_pix); - void _44D2FD_prolly_draw_credits_entry(GUIFont *pFont, int Str, int a4, unsigned int w, unsigned int h, unsigned __int16 a7, unsigned __int16 a8, const char *pString, unsigned __int16 *pPixels, unsigned int uPixelsWidth); + void _44D2FD_prolly_draw_credits_entry(GUIFont *pSecondFont, int uFrameX, int uFrameY, unsigned int w, unsigned int h, + unsigned __int16 firstColor, unsigned __int16 secondColor, const char *pString, + unsigned __int16 *pPixels, unsigned int uPixelsWidth); - static char * _44C933(const char *pString, GUIFont *pFont, GUIFont *a3, int a4, int a5, int a6); + static char * FitTwoFontStringINWindow(const char *pString, GUIFont *pFontMain, GUIFont *pFontSecond, GUIWindow* pWindow, int startPixlOff, int a6); unsigned char cFirstChar; //0 unsigned char cLastChar; //1
--- a/UIMainMenu.cpp Tue Jun 04 18:29:35 2013 +0200 +++ b/UIMainMenu.cpp Wed Jun 05 01:00:40 2013 +0400 @@ -280,10 +280,7 @@ unsigned int v10; // ST2C_4@19 MSG Msg; // [sp+84h] [bp-B8h]@10 int v17; // [sp+A0h] [bp-9Ch]@9 - int pX; // [sp+A4h] [bp-98h]@9 - unsigned int pY; // [sp+A8h] [bp-94h]@9 - int v20; // [sp+ACh] [bp-90h]@9 - int a4; // [sp+B0h] [bp-8Ch]@9 + GUIWindow a2; int pColor2; // [sp+F8h] [bp-44h]@9 int pColor1; // [sp+FCh] [bp-40h]@9 int a5; // [sp+128h] [bp-14h]@1 @@ -321,13 +318,15 @@ pFont = pFontCChar; pFont2 = pFontQuick; v1[pSize] = 0; - v20 = 250; - a4 = 440; - pX = 389; - pY = 19; + + a2.uFrameWidth = 250; + a2.uFrameHeight = 440; + a2.uFrameX = 389; + a2.uFrameY = 19; + pTexture2.uWidth = 250; - pHeight = pFont2->GetStringHeight2(pFont, v1, (int)&pX, 0, 1); - pTexture2.uHeight = pHeight + 2 * a4; + pHeight = pFont2->GetStringHeight2(pFont, v1, &a2, 0, 1); + pTexture2.uHeight = pHeight + 2 * a2.uFrameHeight; pTexture2.uNumPixels = (signed __int16)pTexture2.uWidth * (signed __int16)pTexture2.uHeight; v7 = pAllocator->AllocNamedChunk(pTexture2.pPixels, 2 * pTexture2.uNumPixels, "scrollermap"); pNumPixels = pTexture2.uNumPixels; @@ -341,7 +340,7 @@ pString = (char *)operator new(2 * pSize); strncpy(pString, ptr, pSize); pString[pSize]=0; - pFontQuick->_44D2FD_prolly_draw_credits_entry(pFontCChar, 0, a4, (signed __int16)pTexture2.uWidth, (signed __int16)pTexture2.uHeight, pColor1, + pFontQuick->_44D2FD_prolly_draw_credits_entry(pFontCChar, 0, a2.uFrameHeight, (signed __int16)pTexture2.uWidth, (signed __int16)pTexture2.uHeight, pColor1, pColor2, pString, pTexture2.pPixels, (signed __int16)pTexture2.uWidth); free(pString); pWindow_MainMenu = GUIWindow::Create(0, 0, 640, 480, WINDOW_MainMenu, 0, (int)ptr); @@ -365,8 +364,8 @@ { pRenderer->BeginScene(); pRenderer->DrawTextureRGB(0, 0, &pTexture); - pRenderer->SetTextureClipRect(pX, pY, pX + v20, pY + a4); - pRenderer->_4A5D33(pX, pY, 0, a5, &pTexture2); + pRenderer->SetTextureClipRect(a2.uFrameX, a2.uFrameY, a2.uFrameX + a2.uFrameWidth, a2.uFrameY + a2.uFrameHeight); + pRenderer->_4A5D33(a2.uFrameX, a2.uFrameY, 0, a5, &pTexture2); pRenderer->ResetTextureClipRect(); pRenderer->EndScene(); ++a5;
--- a/UIPartyCreation.cpp Tue Jun 04 18:29:35 2013 +0200 +++ b/UIPartyCreation.cpp Wed Jun 05 01:00:40 2013 +0400 @@ -905,8 +905,8 @@ for (uint k = 0; k < 138; k++) { - if (player->pInventoryItems[k].uItemID) - player->pInventoryItems[k].SetIdentified(); + if (player->pOwnItems[k].uItemID) + player->pOwnItems[k].SetIdentified(); } } }