Mercurial > mm7

comparison Chest.cpp @ 1018:9ac94d00012e

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge
author Grumpy7
date Tue, 21 May 2013 02:24:31 +0200
parents c45d51b3f4f4 e865f349aa41
children d48c762de563
comparison
equal deleted inserted replaced
1017:af20650a052f 1018:9ac94d00012e
346 v8 = 14; 346 v8 = 14;
347 texture_cell_height = ((v8 - 14) >> 5) + 1; 347 texture_cell_height = ((v8 - 14) >> 5) + 1;
348 if ( !areWeLoadingTexture ) 348 if ( !areWeLoadingTexture )
349 { 349 {
350 item_texture->Release(); 350 item_texture->Release();
351 pIcons_LOD->_40F9C5(); 351 pIcons_LOD->SyncLoadedFilesCount();
352 } 352 }
353 if ( (texture_cell_width + test_cell_position % chest_cell_width <= chest_cell_width) && 353 if ( (texture_cell_width + test_cell_position % chest_cell_width <= chest_cell_width) &&
354 (texture_cell_height + test_cell_position / chest_cell_width <= chest_cell_heght) ) 354 (texture_cell_height + test_cell_position / chest_cell_width <= chest_cell_heght) )
355 { //we not put over borders 355 { //we not put over borders
356 _row = 0; 356 _row = 0;
474 v11 = 14; 474 v11 = 14;
475 v13 = ((v11 - 14) >> 5) + 1; 475 v13 = ((v11 - 14) >> 5) + 1;
476 if ( !areWeLoadingTexture ) 476 if ( !areWeLoadingTexture )
477 { 477 {
478 ((Texture *)v9)->Release(); 478 ((Texture *)v9)->Release();
479 pIcons_LOD->_40F9C5(); 479 pIcons_LOD->SyncLoadedFilesCount();
480 } 480 }
481 if ( v13 > 0 ) 481 if ( v13 > 0 )
482 { 482 {
483 v23 = 0; 483 v23 = 0;
484 v20 = v13; 484 v20 = v13;
549 v10 = 14; 549 v10 = 14;
550 textute_cell_height = ((v10 - 14) >> 5) + 1; 550 textute_cell_height = ((v10 - 14) >> 5) + 1;
551 if ( !areWeLoadingTexture ) 551 if ( !areWeLoadingTexture )
552 { 552 {
553 v8->Release(); 553 v8->Release();
554 pIcons_LOD->_40F9C5(); 554 pIcons_LOD->SyncLoadedFilesCount();
555 } 555 }
556 chest_cell_width = pChestWidthsByType[pChests[ uChestID].uChestBitmapID]; 556 chest_cell_width = pChestWidthsByType[pChests[ uChestID].uChestBitmapID];
557 chest_cell_row_pos = 0; 557 chest_cell_row_pos = 0;
558 for(int i=0; i<textute_cell_height; ++i) 558 for(int i=0; i<textute_cell_height; ++i)
559 { 559 {
786 v10 = ((v8 - 14) >> 5) + 1; 786 v10 = ((v8 - 14) >> 5) + 1;
787 v21 = v10; 787 v21 = v10;
788 if ( !areWeLoadingTexture ) 788 if ( !areWeLoadingTexture )
789 { 789 {
790 v5->Release(); 790 v5->Release();
791 pIcons_LOD->_40F9C5(); 791 pIcons_LOD->SyncLoadedFilesCount();
792 v10 = v21; 792 v10 = v21;
793 } 793 }
794 if ( v10 > 0 ) 794 if ( v10 > 0 )
795 { 795 {
796 v11 = 0; 796 v11 = 0;