Mercurial > mm7
diff Engine/Graphics/Render.cpp @ 2524:c7264ab7132f
Main menu rendered using d3d11
author | a.parshin |
---|---|
date | Fri, 10 Oct 2014 17:42:05 +0300 |
parents | c532d5242055 |
children | 4cc81f981afb |
line wrap: on
line diff
--- a/Engine/Graphics/Render.cpp Thu Oct 09 23:33:36 2014 +0300 +++ b/Engine/Graphics/Render.cpp Fri Oct 10 17:42:05 2014 +0300 @@ -6003,8 +6003,9 @@ stru350 Dst; // [sp+Ch] [bp-F8h]@12 HWLTexture* pHWLTexture = pD3DBitmaps.LoadTexture(pName, bMipMaps); - if ( pHWLTexture ) - { + if (!pHWLTexture) + return false; + bMipMaps = !strncmp(pName, "HDWTR", 5); if ( !pRenderD3D->CreateTexture(pHWLTexture->uWidth, pHWLTexture->uHeight, pOutSurface, pOutTexture, true, bMipMaps, uMinDeviceTextureDim) ) @@ -6083,8 +6084,7 @@ delete [] pHWLTexture->pPixels; delete pHWLTexture; return true; - } - return false; + } //----- (004A5048) -------------------------------------------------------- @@ -6368,7 +6368,7 @@ } //----- (004A5B81) -------------------------------------------------------- -void Render::SetTextureClipRect(unsigned int uX, unsigned int uY, unsigned int uZ, unsigned int uW) +void Render::SetUIClipRect(unsigned int uX, unsigned int uY, unsigned int uZ, unsigned int uW) { this->bClip = 1; this->uClipX = uX; @@ -6378,7 +6378,7 @@ } //----- (004A5BB6) -------------------------------------------------------- -void Render::ResetTextureClipRect() +void Render::ResetUIClipRect() { this->bClip = 1; this->uClipX = 0; @@ -7475,7 +7475,7 @@ } //----- (004A6274) -------------------------------------------------------- -void Render::DrawTextureTransparent(unsigned int uX, unsigned int uY, Texture *pTexture) +void Render::DrawTextureIndexedAlpha(unsigned int uX, unsigned int uY, Texture *pTexture) { int uHeight; // ebx@4 unsigned int v11; // edx@9