Mercurial > mm7
diff mm7_1.cpp @ 1047:76ce871b0076
m
author | Ritor1 |
---|---|
date | Thu, 23 May 2013 11:16:46 +0600 |
parents | 7735bdb3c30f |
children | d36681a9e4f8 |
line wrap: on
line diff
--- a/mm7_1.cpp Tue May 21 16:13:48 2013 +0600 +++ b/mm7_1.cpp Thu May 23 11:16:46 2013 +0600 @@ -1015,9 +1015,7 @@ POINT a2; // [sp+84h] [bp-8h]@3 if ( pRenderer->pRenderD3D ) - { v0 = pGame->pVisInstance->get_picked_object_zbuf_val(); - } else { v1 = pMouse->GetCursorPos(&a2); @@ -1027,9 +1025,7 @@ { a2.y = (signed int)(unsigned __int16)v0 >> 3; v21 = (signed int)(unsigned __int16)v0 >> 3; - if ( !(pObjectList->pObjects[pSpriteObjects[v21].uObjectDescID].uFlags & 0x10) - && a2.y < 1000 - && pSpriteObjects[v21].uObjectDescID + if ( !(pObjectList->pObjects[pSpriteObjects[v21].uObjectDescID].uFlags & 0x10) && a2.y < 1000 && pSpriteObjects[v21].uObjectDescID && (unsigned int)v0 < 0x2000000 ) { v22 = &pSpriteObjects[v21].stru_24; @@ -1113,9 +1109,7 @@ v6 = 0; a1.uType = v5; if ( (signed int)pObjectList->uNumObjects <= 0 ) - { LOWORD(v6) = 0; - } else { v7 = (char *)&pObjectList->pObjects->uObjectID; @@ -1138,18 +1132,13 @@ a1.uSoundID = 0; a1.uFacing = 0; a1.uAttributes = 8; - a1.uSectorID = pIndoor->GetSector( - pParty->vPosition.x, - pParty->vPosition.y, - pParty->sEyelevel + pParty->vPosition.z); + a1.uSectorID = pIndoor->GetSector(pParty->vPosition.x, pParty->vPosition.y, pParty->sEyelevel + pParty->vPosition.z); a1.uSpriteFrameID = 0; memcpy(&a1.stru_24, &pParty->pPickedItem, 0x24u); v8 = (int *)pMouse->GetCursorPos(&v25); v9 = UnprojectX(*v8); a1.Create(pParty->sRotationY + v9, 184, 200, 0); - v10 = pIcons_LOD->LoadTexture( - pItemsTable->pItems[pParty->pPickedItem.uItemID].pIconName, - TEXTURE_16BIT_PALETTE); + v10 = pIcons_LOD->LoadTexture(pItemsTable->pItems[pParty->pPickedItem.uItemID].pIconName, TEXTURE_16BIT_PALETTE); if (v10 != -1) pIcons_LOD->pTextures[v10].Release(); pMouse->RemoveHoldingItem();