comparison Outdoor.cpp @ 712:e7c86528a2b3

Merge
author Gloval
date Thu, 21 Mar 2013 23:11:54 +0400
parents 735dab8d3c9a
children 9d13d2ec35a6
comparison
equal deleted inserted replaced
711:a5e587c8e30e 712:e7c86528a2b3
2697 { 2697 {
2698 v3 = pBitmaps_LOD->pTextures; 2698 v3 = pBitmaps_LOD->pTextures;
2699 do 2699 do
2700 { 2700 {
2701 if ( v1 != -1 ? (int)v3 : 0 ) 2701 if ( v1 != -1 ? (int)v3 : 0 )
2702 v3->uDecompressedSize = v2->pTerrain._47CB57((int)v3->pLevelOfDetail0, 2702 v3->uDecompressedSize = v2->pTerrain._47CB57((int)v3->pLevelOfDetail0_prolly_alpha_mask,
2703 v3->palette_id2, 2703 v3->palette_id2,
2704 v3->uTextureWidth * v3->uTextureHeight); 2704 v3->uTextureWidth * v3->uTextureHeight);
2705 ++v1; 2705 ++v1;
2706 ++v3; 2706 ++v3;
2707 } 2707 }