Mercurial > mm7
comparison GUIFont.cpp @ 2086:3920278a2905
Слияние
author | Ritor1 |
---|---|
date | Wed, 11 Dec 2013 23:28:05 +0600 |
parents | 38bf1c70fc70 |
children | d28d3c006077 |
comparison
equal
deleted
inserted
replaced
2085:52abdea20b9e | 2086:3920278a2905 |
---|---|
190 { | 190 { |
191 char_pxl = *pPixels++; | 191 char_pxl = *pPixels++; |
192 if ( char_pxl ) | 192 if ( char_pxl ) |
193 { | 193 { |
194 if ( char_pxl == 1 ) | 194 if ( char_pxl == 1 ) |
195 *draw_buff = pFontPalette[1]; | 195 *draw_buff = pFontPalette[1]; |
196 else | 196 else |
197 *draw_buff = draw_color; | 197 *draw_buff = draw_color; |
198 } | 198 } |
199 ++draw_buff; | 199 ++draw_buff; |
200 } | 200 } |
644 return &temp_string[0]; | 644 return &temp_string[0]; |
645 } | 645 } |
646 //----- (00414162) -------------------------------------------------------- | 646 //----- (00414162) -------------------------------------------------------- |
647 void uGameUIFontMain_initialize() | 647 void uGameUIFontMain_initialize() |
648 { | 648 { |
649 uGameUIFontMain = TargetColor(0xAu, 0, 0); | 649 uGameUIFontMain = Color16(0xAu, 0, 0); |
650 } | 650 } |
651 | 651 |
652 //----- (00414174) -------------------------------------------------------- | 652 //----- (00414174) -------------------------------------------------------- |
653 void uGameUIFontShadow_initialize() | 653 void uGameUIFontShadow_initialize() |
654 { | 654 { |
655 uGameUIFontShadow = TargetColor(0xE6u, 214u, 193u); | 655 uGameUIFontShadow = Color16(0xE6u, 214u, 193u); |
656 } | 656 } |