Mercurial > mm7
diff GUI/UI/Books/UIMapBook.cpp @ 2513:28afacb08f76
Слияние
author | Ritor1 |
---|---|
date | Thu, 02 Oct 2014 19:33:11 +0600 |
parents | 491f0babd563 |
children | c7264ab7132f |
line wrap: on
line diff
--- a/GUI/UI/Books/UIMapBook.cpp Thu Oct 02 19:33:01 2014 +0600 +++ b/GUI/UI/Books/UIMapBook.cpp Thu Oct 02 19:33:11 2014 +0600 @@ -239,7 +239,7 @@ viewparams->_443225(); if ( BtnUp_flag | BtnDown_flag | Book_PageBtn3_flag | Book_PageBtn4_flag | Book_PageBtn5_flag | Book_PageBtn6_flag ) - pAudioPlayer->PlaySound(SOUND_Button2, 0, 0, -1, 0, 0, 0, 0); + pAudioPlayer->PlaySound(SOUND_StartMainChoice02, 0, 0, -1, 0, 0, 0, 0); BtnUp_flag = 0; BtnDown_flag = 0; Book_PageBtn6_flag = 0; @@ -272,52 +272,21 @@ int v28; // edx@21 int v29; // eax@21 double v30; // st7@23 -// signed __int64 v31; // qax@23 -// unsigned short *v32; // edx@23 int textr_width; // esi@23 -// signed int v34; // eax@23 -// signed int v35; // ecx@23 -// int v36; // esi@27 -// int v37; // ecx@27 -// int v38; // edx@31 -// unsigned int v39; // eax@33 -// short *v40; // esi@33 -// short *v41; // edi@33 -// unsigned __int8 v42; // cf@33 -// unsigned int v43; // ecx@33 -// short *v44; // edi@33 -// short *v45; // esi@33 -// int v46; // ecx@33 signed int v47; // esi@38 signed int v48; // ecx@38 int v49; // eax@38 signed int v50; // edx@55 unsigned int v51; // ecx@55 -// int result; // eax@72 int v54; // esi@75 int v55; // eax@75 -// __int16 v56; // si@85 double v57; // st7@85 -// int v58; // ebx@85 -// signed __int64 v59; // qax@85 signed int v60; // edi@85 -// signed __int64 v61; // qax@85 signed int v62; // ebx@85 signed int v63; // esi@85 int v64; // eax@87 -// unsigned int v65; // ebx@95 -// unsigned short *v66; // edx@95 -// unsigned __int16 *v67; // esi@96 -// int v68; // edi@98 -// unsigned __int16 v69; // cx@99 -// signed int v73; // [sp-4h] [bp-48068h]@59 -// unsigned __int16 v74; // [sp-4h] [bp-48068h]@79 - //unsigned short map_texture_16[320 * 460 + 256]; // [sp+Ch] [bp-48058h]@23 -// int v76; // [sp+4800Ch] [bp-58h]@23 - //unsigned __int16 *v77; // [sp+48010h] [bp-54h]@27 unsigned __int16 *pPalette_16; // [sp+48014h] [bp-50h]@23 int map_tile_X; // [sp+48020h] [bp-44h]@23 - //unsigned __int16* render16_data; unsigned char* texture8_data; unsigned char* curr_line; int scale_increment; @@ -339,8 +308,6 @@ unsigned int v95; // [sp+48058h] [bp-Ch]@16 int map_tile_Y; // [sp+4805Ch] [bp-8h]@10 const void *v97; // [sp+48060h] [bp-4h]@16 -// unsigned short *a4a; // [sp+4806Ch] [bp+8h]@85 - //int a5a; // [sp+48070h] [bp+Ch]@86 screenCenter_X = (signed int)(tl_x + br_x) / 2; screenCenterY = (signed int)(tl_y + br_y) / 2; @@ -410,7 +377,7 @@ else { black = Color16(0, 0, 0); - teal = Color16(0, 0xFFu, 0xFFu); + teal = Color16(0, 0xFF, 0xFF); uNumBlueFacesInBLVMinimap = 0; if ( pIndoor->pMapOutlines->uNumOutlines ) { @@ -421,16 +388,16 @@ { if ( !(pIndoor->pMapOutlines->pOutlines[i].uFlags & 1) ) { - if ( !(!(pIndoor->pFaces[pIndoor->pMapOutlines->pOutlines[i].uFace1ID].uAttributes & FACE_UNKNOW4) - && !(pIndoor->pFaces[pIndoor->pMapOutlines->pOutlines[i].uFace2ID].uAttributes & FACE_UNKNOW4) )) + if ( !(!(pIndoor->pFaces[pIndoor->pMapOutlines->pOutlines[i].uFace1ID].uAttributes & FACE_UNKNOW7) + && !(pIndoor->pFaces[pIndoor->pMapOutlines->pOutlines[i].uFace2ID].uAttributes & FACE_UNKNOW7) )) { pIndoor->pMapOutlines->pOutlines[i].uFlags = pIndoor->pMapOutlines->pOutlines[i].uFlags | 1; pIndoor->_visible_outlines[i >> 3] |= 1 << (7 - i % 8); } } if ( (!(pIndoor->pMapOutlines->pOutlines[i].uFlags & 1) - && !(!(pIndoor->pFaces[pIndoor->pMapOutlines->pOutlines[i].uFace1ID].uAttributes & FACE_UNKNOW4) - && !(pIndoor->pFaces[pIndoor->pMapOutlines->pOutlines[i].uFace2ID].uAttributes & FACE_UNKNOW4) )) + && !(!(pIndoor->pFaces[pIndoor->pMapOutlines->pOutlines[i].uFace1ID].uAttributes & FACE_UNKNOW7) + && !(pIndoor->pFaces[pIndoor->pMapOutlines->pOutlines[i].uFace2ID].uAttributes & FACE_UNKNOW7) )) || pIndoor->pMapOutlines->pOutlines[i].uFlags & 1) { v93 = (unsigned __int16 *)(pIndoor->pVertices[pIndoor->pMapOutlines->pOutlines[i].uVertex1ID].x - viewparams->sViewCenterX); @@ -545,7 +512,7 @@ else pRenderer->RasterLine2D(v54, screenCenterY - (int)v97, (fixpoint_mul((signed int)v93, viewparams->uMapBookMapZoom)) + screenCenter_X, - screenCenterY - (int)v97, Color16(0xFFu, 0xFFu, 0xFFu)); + screenCenterY - (int)v97, Color16(0xFF, 0xFF, 0xFF)); } } }