Mercurial > mm7

comparison UI/Books/UIMapBook.cpp @ 2365:65789351a537

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
OutdoorLocation::_47F04C and OutdoorLocation::_47F097 to OutdoorLocation::IsMapCellFullyRevealed and OutdoorLocation::IsMapCellPartiallyRevealed
author Grumpy7
date Sun, 11 May 2014 22:55:26 +0200
parents 7f2e111bbafb
children 8cee51ce4382
comparison
equal deleted inserted replaced
2364:94e5a9740727 2365:65789351a537
569 map_tile_Y = (v63 - 80) / 4; 569 map_tile_Y = (v63 - 80) / 4;
570 v64 = teal; 570 v64 = teal;
571 for (int x = 0; x < screenCenterY; ++x) 571 for (int x = 0; x < screenCenterY; ++x)
572 { 572 {
573 map_tile_X = (v64 - 80) / 4; 573 map_tile_X = (v64 - 80) / 4;
574 if ( !pOutdoor->_47F04C(map_tile_X, map_tile_Y) ) 574 if ( !pOutdoor->IsMapCellFullyRevealed(map_tile_X, map_tile_Y) )
575 { 575 {
576 if ( pOutdoor->_47F097(map_tile_X, map_tile_Y) ) 576 if ( pOutdoor->IsMapCellPartiallyRevealed(map_tile_X, map_tile_Y) )
577 { 577 {
578 if ( !((x + screenCenter_X) % 2) ) 578 if ( !((x + screenCenter_X) % 2) )
579 //*a4a = Color16(12, 12, 12); 579 //*a4a = Color16(12, 12, 12);
580 pRenderer->WritePixel16(tl_x + x, tl_y + y, Color16(12, 12, 12)); 580 pRenderer->WritePixel16(tl_x + x, tl_y + y, Color16(12, 12, 12));
581 } 581 }
676 global_coord_Y = (signed __int64)((double)v21 - (double)(pY - 181) * v0); 676 global_coord_Y = (signed __int64)((double)v21 - (double)(pY - 181) * v0);
677 677
678 result = 0; 678 result = 0;
679 map_tile_X = abs(global_coord_X + 22528) / 512;//In the mapbook only lady Margaret dispays for defoult zoom(В книге карты только Леди Маргарита всплывает при дефолтном зуме) 679 map_tile_X = abs(global_coord_X + 22528) / 512;//In the mapbook only lady Margaret dispays for defoult zoom(В книге карты только Леди Маргарита всплывает при дефолтном зуме)
680 map_tile_Y = abs(global_coord_Y - 22528) / 512; 680 map_tile_Y = abs(global_coord_Y - 22528) / 512;
681 if ( pOutdoor->_47F04C(map_tile_X, map_tile_Y) && uCurrentlyLoadedLevelType == LEVEL_Outdoor && (signed int)pOutdoor->uNumBModels > 0 ) 681 if ( pOutdoor->IsMapCellFullyRevealed(map_tile_X, map_tile_Y) && uCurrentlyLoadedLevelType == LEVEL_Outdoor && (signed int)pOutdoor->uNumBModels > 0 )
682 { 682 {
683 for(int i = 0; i < pOutdoor->uNumBModels && !result; i++) 683 for(int i = 0; i < pOutdoor->uNumBModels && !result; i++)
684 { 684 {
685 if ( int_get_vector_length(abs((signed)pOutdoor->pBModels[i].vBoundingCenter.x - global_coord_X), 685 if ( int_get_vector_length(abs((signed)pOutdoor->pBModels[i].vBoundingCenter.x - global_coord_X),
686 abs((signed)pOutdoor->pBModels[i].vBoundingCenter.y - global_coord_Y), 0) < pOutdoor->pBModels[i].sBoundingRadius ) 686 abs((signed)pOutdoor->pBModels[i].vBoundingCenter.y - global_coord_Y), 0) < pOutdoor->pBModels[i].sBoundingRadius )