Mercurial > mm7
comparison mm7_5.cpp @ 61:6c2cefdaea3e
Слияние
author | Ritor1 |
---|---|
date | Tue, 22 Jan 2013 18:41:17 +0600 |
parents | 8af333180755 5a08b193507f |
children | f12a7fd4d114 |
comparison
equal
deleted
inserted
replaced
60:b9d70af644f3 | 61:6c2cefdaea3e |
---|---|
16444 pWindow.uFrameY += 12; | 16444 pWindow.uFrameY += 12; |
16445 pWindow.uFrameHeight -= 12; | 16445 pWindow.uFrameHeight -= 12; |
16446 pWindow.uFrameZ = pWindow.uFrameX + pWindow.uFrameWidth - 1; | 16446 pWindow.uFrameZ = pWindow.uFrameX + pWindow.uFrameWidth - 1; |
16447 pWindow.uFrameW = pWindow.uFrameY + pWindow.uFrameHeight - 1; | 16447 pWindow.uFrameW = pWindow.uFrameY + pWindow.uFrameHeight - 1; |
16448 pColor = GenerateColorAsCloseAsPossibleToR8G8B8InTargetFormat(0xFF, 0xFF, 0x9B); | 16448 pColor = GenerateColorAsCloseAsPossibleToR8G8B8InTargetFormat(0xFF, 0xFF, 0x9B); |
16449 sprintf(pTmpBuf, format_4E2D80, pColor, pStr); | 16449 sprintf(pTmpBuf, format_4E2D80, pColor, pStr);//"\f%05d%s\f00000\n" |
16450 pWindow.DrawText(pFontCreate, 0, 0, 0, pTmpBuf, 3, 0, 0); //DrawTitleText | 16450 pWindow.DrawTitleText(pFontCreate, 0, 0, 0, pTmpBuf, 3); |
16451 pWindow.DrawText(pFontSmallnum, 1, pFontLucida->uFontHeight, 0, pHint, 0, 0, 0); | 16451 pWindow.DrawText(pFontSmallnum, 1, pFontLucida->uFontHeight, 0, pHint, 0, 0, 0); |
16452 } | 16452 } |
16453 LABEL_132: | 16453 LABEL_132: |
16454 dword_507BF0_is_there_popup_onscreen = 1; | 16454 dword_507BF0_is_there_popup_onscreen = 1; |
16455 viewparams->bRedrawGameUI = 1; | 16455 viewparams->bRedrawGameUI = 1; |