Mercurial > mm7

comparison Indoor.cpp @ 945:0d96349d8c87

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Restoring inlined methods
author Nomad
date Wed, 01 May 2013 14:09:49 +0200
parents 2db21a810d48
children e865f349aa41 c45d51b3f4f4 8b492d4722d4
comparison
equal deleted inserted replaced
940:4dd4184d4248 945:0d96349d8c87
1204 unsigned int result; // eax@1 1204 unsigned int result; // eax@1
1205 unsigned int v7; // ecx@5 1205 unsigned int v7; // ecx@5
1206 1206
1207 v1 = &pIndoor->pFaces[uFaceID]; 1207 v1 = &pIndoor->pFaces[uFaceID];
1208 v2 = &pIndoor->pFaceExtras[v1->uFaceExtraID]; 1208 v2 = &pIndoor->pFaceExtras[v1->uFaceExtraID];
1209 v3 = (Texture *)(v1->uBitmapID != -1 ? (int)&pBitmaps_LOD->pTextures[v1->uBitmapID] : 0); 1209 v3 = pBitmaps_LOD->GetTexture(v1->uBitmapID);
1210 stru_F8AD28.pDeltaUV[0] = v2->sTextureDeltaU; 1210 stru_F8AD28.pDeltaUV[0] = v2->sTextureDeltaU;
1211 stru_F8AD28.pDeltaUV[1] = v2->sTextureDeltaV; 1211 stru_F8AD28.pDeltaUV[1] = v2->sTextureDeltaV;
1212 v4 = GetTickCount(); 1212 v4 = GetTickCount();
1213 v5 = v1->uAttributes; 1213 v5 = v1->uAttributes;
1214 result = v4 >> 3; 1214 result = v4 >> 3;
1617 1617
1618 if ( uAttributes & 0x4000 ) 1618 if ( uAttributes & 0x4000 )
1619 v1 = pTextureFrameTable->GetFrameTexture(this->uBitmapID, pBLVRenderParams->field_0_timer_); 1619 v1 = pTextureFrameTable->GetFrameTexture(this->uBitmapID, pBLVRenderParams->field_0_timer_);
1620 else 1620 else
1621 v1 = uBitmapID; 1621 v1 = uBitmapID;
1622 return (Texture *)(v1 != -1 ? (int)&pBitmaps_LOD->pTextures[v1] : 0); 1622 return pBitmaps_LOD->GetTexture(v1);
1623 } 1623 }
1624 1624
1625 1625
1626 //----- (00498B15) -------------------------------------------------------- 1626 //----- (00498B15) --------------------------------------------------------
1627 void IndoorLocation::Release() 1627 void IndoorLocation::Release()
3703 { 3703 {
3704 if ( v51 & 0x20000 ) 3704 if ( v51 & 0x20000 )
3705 { 3705 {
3706 v52 = v15->uBitmapID; 3706 v52 = v15->uBitmapID;
3707 if ( v52 != -1 ) 3707 if ( v52 != -1 )
3708 v28->sTextureDeltaV -= v82 + (v52 != -1 ? pBitmaps_LOD->pTextures[v52].uTextureHeight : 26); 3708 v28->sTextureDeltaV -= v82 + pBitmaps_LOD->GetTexture(v52)->uTextureHeight;
3709 } 3709 }
3710 } 3710 }
3711 if ( BYTE2(v15->uAttributes) & 4 ) 3711 if ( BYTE2(v15->uAttributes) & 4 )
3712 { 3712 {
3713 //v75 = door->vDirection.x; 3713 //v75 = door->vDirection.x;