Mercurial > mm7

comparison GUIWindow.cpp @ 1178:f7ad7bd0a806

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Слияние
author Ritor1
date Tue, 04 Jun 2013 09:44:53 +0600
parents 29a8defbad9e
children 0dbf6c4dd029
comparison
equal deleted inserted replaced
1177:ce5ff6d32200 1178:f7ad7bd0a806
1 #ifdef _MSC_VER
2 #define _CRT_SECURE_NO_WARNINGS
3 #endif
4
1 #include "GUIWindow.h" 5 #include "GUIWindow.h"
2 #include "GUIFont.h" 6 #include "GUIFont.h"
3 #include "Party.h" 7 #include "Party.h"
4 #include "LOD.h" 8 #include "LOD.h"
5 #include "Keyboard.h" 9 #include "Keyboard.h"
1377 v15 = (unsigned __int8)v32[v14]; 1381 v15 = (unsigned __int8)v32[v14];
1378 v16 = *((int *)&v10->cFirstChar + 3 * v15 + 9); 1382 v16 = *((int *)&v10->cFirstChar + 3 * v15 + 9);
1379 v28 = *((int *)&v10->cFirstChar + 3 * v15 + 9); 1383 v28 = *((int *)&v10->cFirstChar + 3 * v15 + 9);
1380 if ( v14 > 0 ) 1384 if ( v14 > 0 )
1381 v12 += v10->pMetrics[v15].uLeftSpacing; 1385 v12 += v10->pMetrics[v15].uLeftSpacing;
1382 v17 = (int)((char *)&v10[1] + v10->field_C20[v15]); 1386 v17 = (int)((char *)&v10[1] + v10->font_pixels_offset[v15]);
1383 if ( (short)uFontColor ) 1387 if ( (short)uFontColor )
1384 pRenderer->DrawText( 1388 pRenderer->DrawText(
1385 v12, 1389 v12,
1386 v13, 1390 v13,
1387 (unsigned __int8 *)v17, 1391 (unsigned __int8 *)v17,
1544 { 1548 {
1545 v20 = *((int *)&pFont->cFirstChar + 3 * v16 + 9); 1549 v20 = *((int *)&pFont->cFirstChar + 3 * v16 + 9);
1546 v34 = *((int *)&pFont->cFirstChar + 3 * v16 + 9); 1550 v34 = *((int *)&pFont->cFirstChar + 3 * v16 + 9);
1547 if ( (signed int)Str1b > 0 ) 1551 if ( (signed int)Str1b > 0 )
1548 v13 += pFont->pMetrics[v16].uLeftSpacing; 1552 v13 += pFont->pMetrics[v16].uLeftSpacing;
1549 v21 = (int)((char *)&pFont[1] + pFont->field_C20[v16]); 1553 v21 = (int)((char *)&pFont[1] + pFont->font_pixels_offset[v16]);
1550 if ( (short)uColor ) 1554 if ( (short)uColor )
1551 pRenderer->DrawText(v13, v14, (unsigned __int8 *)v21, v20, LOBYTE(pFont->uFontHeight), pFont->pFontPalettes[0], uColor, 0); 1555 pRenderer->DrawText(v13, v14, (unsigned __int8 *)v21, v20, LOBYTE(pFont->uFontHeight), pFont->pFontPalettes[0], uColor, 0);
1552 else 1556 else
1553 pRenderer->DrawTextPalette(v13, v14, v21, v20, LOBYTE(pFont->uFontHeight), pFont->pFontPalettes[0], 0); 1557 pRenderer->DrawTextPalette(v13, v14, v21, v20, LOBYTE(pFont->uFontHeight), pFont->pFontPalettes[0], 0);
1554 v13 += v34; 1558 v13 += v34;