Mercurial > mm7
comparison UIMainMenu.cpp @ 739:e0a8cc28caeb
Слияние
author | Ritor1 |
---|---|
date | Fri, 22 Mar 2013 09:14:45 +0600 |
parents | da130dd3092a |
children | dfd683c4f538 |
comparison
equal
deleted
inserted
replaced
738:7378398c34e4 | 739:e0a8cc28caeb |
---|---|
61 pPaletteManager->RecalculateAll(); | 61 pPaletteManager->RecalculateAll(); |
62 | 62 |
63 for (uint i = 0; i < 480; ++i) | 63 for (uint i = 0; i < 480; ++i) |
64 pSRZBufferLineOffsets[i] = 640 * i; | 64 pSRZBufferLineOffsets[i] = 640 * i; |
65 | 65 |
66 pRenderer->ResetClip(); | 66 pRenderer->ResetTextureClipRect(); |
67 | 67 |
68 uTextureID_FONTPAL = pIcons_LOD->LoadTexture("FONTPAL", TEXTURE_16BIT_PALETTE); | 68 uTextureID_FONTPAL = pIcons_LOD->LoadTexture("FONTPAL", TEXTURE_16BIT_PALETTE); |
69 pFontArrus = LoadFont("arrus.fnt", "FONTPAL", NULL); | 69 pFontArrus = LoadFont("arrus.fnt", "FONTPAL", NULL); |
70 pFontLucida = LoadFont("lucida.fnt", "FONTPAL", NULL); | 70 pFontLucida = LoadFont("lucida.fnt", "FONTPAL", NULL); |
71 pFontCreate = LoadFont("create.fnt", "FONTPAL", NULL); | 71 pFontCreate = LoadFont("create.fnt", "FONTPAL", NULL); |
350 { | 350 { |
351 if (pAsyncMouse) | 351 if (pAsyncMouse) |
352 pAsyncMouse->_46B736_consume_click_lists(1); | 352 pAsyncMouse->_46B736_consume_click_lists(1); |
353 pRenderer->BeginScene(); | 353 pRenderer->BeginScene(); |
354 pRenderer->DrawTextureRGB(0, 0, &pTexture); | 354 pRenderer->DrawTextureRGB(0, 0, &pTexture); |
355 pRenderer->Clip(pX, pY, pX + v20, pY + a4); | 355 pRenderer->SetTextureClipRect(pX, pY, pX + v20, pY + a4); |
356 pRenderer->_4A5D33(pX, pY, 0, a5, &pTexture2); | 356 pRenderer->_4A5D33(pX, pY, 0, a5, &pTexture2); |
357 pRenderer->ResetClip(); | 357 pRenderer->ResetTextureClipRect(); |
358 pRenderer->EndScene(); | 358 pRenderer->EndScene(); |
359 ++a5; | 359 ++a5; |
360 if ( a5 >= (signed __int16)pTexture2.uHeight ) | 360 if ( a5 >= (signed __int16)pTexture2.uHeight ) |
361 SetCurrentMenuID(MENU_MAIN); | 361 SetCurrentMenuID(MENU_MAIN); |
362 pRenderer->Present(); | 362 pRenderer->Present(); |