comparison UI/UIMainMenu.cpp @ 1669:bd28d08e2c75

Merge
author Ritor1
date Tue, 17 Sep 2013 22:55:48 +0600
parents d17247968bd6 8094f1706b1f
children 4bbb80c7dba7
comparison
equal deleted inserted replaced
1668:d17247968bd6 1669:bd28d08e2c75
291 teal = TargetColor(0, 0xFFu, 0xFFu); 291 teal = TargetColor(0, 0xFFu, 0xFFu);
292 fill_pixels_fast(teal, pTexture2.pPixels, pNumPixels); 292 fill_pixels_fast(teal, pTexture2.pPixels, pNumPixels);
293 pTexture2._allocation_flags = 0; 293 pTexture2._allocation_flags = 0;
294 pColor1 = TargetColor(0x70u, 0x8Fu, 0xFEu); 294 pColor1 = TargetColor(0x70u, 0x8Fu, 0xFEu);
295 pColor2 = TargetColor(0xECu, 0xE6u, 0x9Cu); 295 pColor2 = TargetColor(0xECu, 0xE6u, 0x9Cu);
296 pString = (char *)operator new(2 * pSize); 296 pString = (char *)malloc(2 * pSize);
297 strncpy(pString, ptr, pSize); 297 strncpy(pString, ptr, pSize);
298 pString[pSize]=0; 298 pString[pSize]=0;
299 pFontQuick->_44D2FD_prolly_draw_credits_entry(pFontCChar, 0, a2.uFrameHeight, (signed __int16)pTexture2.uWidth, (signed __int16)pTexture2.uHeight, pColor1, 299 pFontQuick->_44D2FD_prolly_draw_credits_entry(pFontCChar, 0, a2.uFrameHeight, (signed __int16)pTexture2.uWidth, (signed __int16)pTexture2.uHeight, pColor1,
300 pColor2, pString, pTexture2.pPixels, (signed __int16)pTexture2.uWidth); 300 pColor2, pString, pTexture2.pPixels, (signed __int16)pTexture2.uWidth);
301 free(pString); 301 free(pString);