Mercurial > mm7
diff Viewport.cpp @ 2086:3920278a2905
Слияние
author | Ritor1 |
---|---|
date | Wed, 11 Dec 2013 23:28:05 +0600 |
parents | 52abdea20b9e 259df09dfb50 |
children | 85e9766d6124 |
line wrap: on
line diff
--- a/Viewport.cpp Wed Dec 11 23:12:54 2013 +0600 +++ b/Viewport.cpp Wed Dec 11 23:28:05 2013 +0600 @@ -54,9 +54,9 @@ this->uScreenWidth = br_x - tl_x + 1; this->uScreenHeight = br_y - tl_y + 1; this->uScreenCenterX = (signed int)(br_x + tl_x) /2; - if ( pRenderer->pRenderD3D == 0 ) - this->uScreenCenterY = this->uScreen_BR_Y - fixpoint_mul(field_30, uScreenHeight); - else + //if ( pRenderer->pRenderD3D == 0 ) + // this->uScreenCenterY = this->uScreen_BR_Y - fixpoint_mul(field_30, uScreenHeight); + //else this->uScreenCenterY = (br_y + tl_y)/2; SetViewport(this->uScreen_TL_X, this->uScreen_TL_Y, this->uScreen_BR_X, this->uScreen_BR_Y); } @@ -195,7 +195,7 @@ void ViewingParams::InitGrayPalette() { for (unsigned short i=0; i<256; ++i) - pPalette[i]=TargetColor(i, i, i); + pPalette[i]=Color16(i, i, i); } //----- (00443365) --------------------------------------------------------