Mercurial > mm7

comparison UI/UIMainMenu.cpp @ 1631:8094f1706b1f

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
operator new() -> malloc
author Nomad
date Tue, 10 Sep 2013 21:17:00 +0200
parents 75fafd8ced59
children d65f6e73f213 bd28d08e2c75
comparison
equal deleted inserted replaced
1585:e42073046f92 1631:8094f1706b1f
295 teal = TargetColor(0, 0xFFu, 0xFFu); 295 teal = TargetColor(0, 0xFFu, 0xFFu);
296 fill_pixels_fast(teal, pTexture2.pPixels, pNumPixels); 296 fill_pixels_fast(teal, pTexture2.pPixels, pNumPixels);
297 pTexture2._allocation_flags = 0; 297 pTexture2._allocation_flags = 0;
298 pColor1 = TargetColor(0x70u, 0x8Fu, 0xFEu); 298 pColor1 = TargetColor(0x70u, 0x8Fu, 0xFEu);
299 pColor2 = TargetColor(0xECu, 0xE6u, 0x9Cu); 299 pColor2 = TargetColor(0xECu, 0xE6u, 0x9Cu);
300 pString = (char *)operator new(2 * pSize); 300 pString = (char *)malloc(2 * pSize);
301 strncpy(pString, ptr, pSize); 301 strncpy(pString, ptr, pSize);
302 pString[pSize]=0; 302 pString[pSize]=0;
303 pFontQuick->_44D2FD_prolly_draw_credits_entry(pFontCChar, 0, a2.uFrameHeight, (signed __int16)pTexture2.uWidth, (signed __int16)pTexture2.uHeight, pColor1, 303 pFontQuick->_44D2FD_prolly_draw_credits_entry(pFontCChar, 0, a2.uFrameHeight, (signed __int16)pTexture2.uWidth, (signed __int16)pTexture2.uHeight, pColor1,
304 pColor2, pString, pTexture2.pPixels, (signed __int16)pTexture2.uWidth); 304 pColor2, pString, pTexture2.pPixels, (signed __int16)pTexture2.uWidth);
305 free(pString); 305 free(pString);