Mercurial > mm7
comparison UI/UiGame.cpp @ 2101:ee2724b9ca05
RasterLine2D fix and etc.
author | Ritor1 |
---|---|
date | Mon, 16 Dec 2013 18:43:42 +0600 |
parents | 2b39f6b451f9 |
children | 0db53678ff48 |
comparison
equal
deleted
inserted
replaced
2100:e460ca22fe8a | 2101:ee2724b9ca05 |
---|---|
1817 | 1817 |
1818 //----- (00441D38) -------------------------------------------------------- | 1818 //----- (00441D38) -------------------------------------------------------- |
1819 void GameUI_DrawMinimap(unsigned int uX, unsigned int uY, unsigned int uZ, unsigned int uW, unsigned int uZoom, unsigned int bRedrawOdmMinimap) | 1819 void GameUI_DrawMinimap(unsigned int uX, unsigned int uY, unsigned int uZ, unsigned int uW, unsigned int uZoom, unsigned int bRedrawOdmMinimap) |
1820 { | 1820 { |
1821 int uHeight; // ebx@6 | 1821 int uHeight; // ebx@6 |
1822 unsigned int pW; // ebx@23 | 1822 signed int pW; // ebx@23 |
1823 int v15; // eax@23 | 1823 int v15; // eax@23 |
1824 double v20; // st7@30 | 1824 double v20; // st7@30 |
1825 signed int v27; // eax@37 | 1825 signed int v27; // eax@37 |
1826 //unsigned __int16 *v28; // ecx@37 | 1826 //unsigned __int16 *v28; // ecx@37 |
1827 signed int v29; // edi@40 | 1827 signed int v29; // edi@40 |
1828 int pPoint_X; // edi@72 | 1828 int pPoint_X; // edi@72 |
1829 int pPoint_Y; // ebx@72 | 1829 int pPoint_Y; // ebx@72 |
1830 unsigned int lPitch; // [sp+20h] [bp-34h]@1 | 1830 unsigned int lPitch; // [sp+20h] [bp-34h]@1 |
1831 unsigned int pY; // [sp+20h] [bp-34h]@23 | 1831 signed int pY; // [sp+20h] [bp-34h]@23 |
1832 unsigned int pX; // [sp+24h] [bp-30h]@23 | 1832 signed int pX; // [sp+24h] [bp-30h]@23 |
1833 signed int v70; // [sp+24h] [bp-30h]@37 | 1833 signed int v70; // [sp+24h] [bp-30h]@37 |
1834 signed int uBluea; // [sp+28h] [bp-2Ch]@37 | 1834 signed int uBluea; // [sp+28h] [bp-2Ch]@37 |
1835 int v73; // [sp+2Ch] [bp-28h]@30 | 1835 int v73; // [sp+2Ch] [bp-28h]@30 |
1836 signed int uCenterY; // [sp+48h] [bp-Ch]@1 | 1836 signed int uCenterY; // [sp+48h] [bp-Ch]@1 |
1837 signed int uCenterX; // [sp+4Ch] [bp-8h]@1 | 1837 signed int uCenterX; // [sp+4Ch] [bp-8h]@1 |
1838 signed int uWidth; // [sp+5Ch] [bp+8h]@30 | 1838 signed int uWidth; // [sp+5Ch] [bp+8h]@30 |
1839 unsigned int pZ; // [sp+60h] [bp+Ch]@23 | 1839 signed int pZ; // [sp+60h] [bp+Ch]@23 |
1840 float uWb; // [sp+60h] [bp+Ch]@30 | 1840 float uWb; // [sp+60h] [bp+Ch]@30 |
1841 unsigned int pColor; | 1841 unsigned int pColor; |
1842 | 1842 |
1843 uCenterX = (uX + uZ) / 2; | 1843 uCenterX = (uX + uZ) / 2; |
1844 uCenterY = (uY + uW) / 2; | 1844 uCenterY = (uY + uW) / 2; |
1990 pZ = uCenterX + ((signed int)(((unsigned int)((unsigned __int64)(uZoom * (signed __int64)pIndoor->pVertices[pOutline->uVertex2ID].x) >> 16) << 16) - uZoom * pParty->vPosition.x) >> 16); | 1990 pZ = uCenterX + ((signed int)(((unsigned int)((unsigned __int64)(uZoom * (signed __int64)pIndoor->pVertices[pOutline->uVertex2ID].x) >> 16) << 16) - uZoom * pParty->vPosition.x) >> 16); |
1991 pW = uCenterY - ((signed int)(((unsigned int)((unsigned __int64)(uZoom * (signed __int64)pIndoor->pVertices[pOutline->uVertex2ID].y) >> 16) << 16) - uZoom * pParty->vPosition.y) >> 16); | 1991 pW = uCenterY - ((signed int)(((unsigned int)((unsigned __int64)(uZoom * (signed __int64)pIndoor->pVertices[pOutline->uVertex2ID].y) >> 16) << 16) - uZoom * pParty->vPosition.y) >> 16); |
1992 v15 = abs(pOutline->sZ - pParty->vPosition.z) / 8; | 1992 v15 = abs(pOutline->sZ - pParty->vPosition.z) / 8; |
1993 if ( v15 > 100 ) | 1993 if ( v15 > 100 ) |
1994 v15 = 100; | 1994 v15 = 100; |
1995 //if ( i == 1000 )//pY < 0 && pW > 16 ) | |
1996 //__debugbreak(); | |
1995 pRenderer->RasterLine2D(pX, pY, pZ, pW, viewparams->pPalette[-v15 + 200]); | 1997 pRenderer->RasterLine2D(pX, pY, pZ, pW, viewparams->pPalette[-v15 + 200]); |
1996 } | 1998 } |
1997 } | 1999 } |
1998 | 2000 |
1999 for (uint i = 0; i < uNumBlueFacesInBLVMinimap; ++i) | 2001 for (uint i = 0; i < uNumBlueFacesInBLVMinimap; ++i) |