Mercurial > mm7

comparison GUI/GUIWindow.cpp @ 2525:4cc81f981afb

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Everything except game can use d3d11
author a.parshin
date Fri, 10 Oct 2014 18:28:04 +0300
parents c7264ab7132f
children e72e62ec9273
comparison
equal deleted inserted replaced
2524:c7264ab7132f 2525:4cc81f981afb
1201 v17 = (int)((char *)&v10[1] + v10->font_pixels_offset[v15]); 1201 v17 = (int)((char *)&v10[1] + v10->font_pixels_offset[v15]);
1202 if ( (short)uFontColor ) 1202 if ( (short)uFontColor )
1203 pRenderer->DrawText(v12, v13, (unsigned __int8 *)v17, v16, LOBYTE(v10->uFontHeight), 1203 pRenderer->DrawText(v12, v13, (unsigned __int8 *)v17, v16, LOBYTE(v10->uFontHeight),
1204 v10->pFontPalettes[0], uFontColor, uFontShadowColor); 1204 v10->pFontPalettes[0], uFontColor, uFontShadowColor);
1205 else 1205 else
1206 pRenderer->DrawTextPalette(v12, v13, (unsigned char*)v17, v16, LOBYTE(v10->uFontHeight), 1206 pRenderer->DrawTextAlpha(v12, v13, (unsigned char*)v17, v16, LOBYTE(v10->uFontHeight),
1207 v10->pFontPalettes[0], a7); 1207 v10->pFontPalettes[0], a7);
1208 LOBYTE(v11) = v30; 1208 LOBYTE(v11) = v30;
1209 v12 += v28; 1209 v12 += v28;
1210 if ( (signed int)pInString < (signed int)v30 ) 1210 if ( (signed int)pInString < (signed int)v30 )
1211 { 1211 {
1351 v13 += pFont->pMetrics[v15].uLeftSpacing; 1351 v13 += pFont->pMetrics[v15].uLeftSpacing;
1352 v21 = &pFont->pFontData[pFont->font_pixels_offset[v15]]; 1352 v21 = &pFont->pFontData[pFont->font_pixels_offset[v15]];
1353 if ( uColor ) 1353 if ( uColor )
1354 pRenderer->DrawText(v13, v14, v21, v20, pFont->uFontHeight, pFont->pFontPalettes[0], uColor, 0); 1354 pRenderer->DrawText(v13, v14, v21, v20, pFont->uFontHeight, pFont->pFontPalettes[0], uColor, 0);
1355 else 1355 else
1356 pRenderer->DrawTextPalette(v13, v14, v21, v20, pFont->uFontHeight, pFont->pFontPalettes[0], 0); 1356 pRenderer->DrawTextAlpha(v13, v14, v21, v20, pFont->uFontHeight, pFont->pFontPalettes[0], false);
1357 v13 += v20; 1357 v13 += v20;
1358 if ( i < (signed int)pNumLen ) 1358 if ( i < (signed int)pNumLen )
1359 v13 += pFont->pMetrics[v15].uRightSpacing; 1359 v13 += pFont->pMetrics[v15].uRightSpacing;
1360 } 1360 }
1361 } 1361 }