Mercurial > mm7

comparison mm7_3.cpp @ 712:e7c86528a2b3

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge
author Gloval
date Thu, 21 Mar 2013 23:11:54 +0400
parents a5e587c8e30e 735dab8d3c9a
children 9d13d2ec35a6
comparison
equal deleted inserted replaced
711:a5e587c8e30e 712:e7c86528a2b3
8252 v19 = (unsigned __int16 *)v18->pLevelOfDetail3; 8252 v19 = (unsigned __int16 *)v18->pLevelOfDetail3;
8253 } 8253 }
8254 } 8254 }
8255 else 8255 else
8256 { 8256 {
8257 v19 = (unsigned __int16 *)v18->pLevelOfDetail0; 8257 v19 = (unsigned __int16 *)v18->pLevelOfDetail0_prolly_alpha_mask;
8258 } 8258 }
8259 a1.pTextureLOD = v19; 8259 a1.pTextureLOD = v19;
8260 X = (unsigned __int64)(v36 * (signed __int64)v38) >> 16; 8260 X = (unsigned __int64)(v36 * (signed __int64)v38) >> 16;
8261 v20 = v3->ptr_38; 8261 v20 = v3->ptr_38;
8262 X = v38; 8262 X = v38;
8456 } 8456 }
8457 else 8457 else
8458 { 8458 {
8459 v19 = v3->pTexture; 8459 v19 = v3->pTexture;
8460 v84 = 0; 8460 v84 = 0;
8461 v18 = (unsigned __int16 *)v19->pLevelOfDetail0; 8461 v18 = (unsigned __int16 *)v19->pLevelOfDetail0_prolly_alpha_mask;
8462 } 8462 }
8463 a1.pTextureLOD = v18; 8463 a1.pTextureLOD = v18;
8464 LABEL_16: 8464 LABEL_16:
8465 if ( v18 ) 8465 if ( v18 )
8466 { 8466 {
8912 } 8912 }
8913 else 8913 else
8914 { 8914 {
8915 v22 = v5->pTexture; 8915 v22 = v5->pTexture;
8916 v75 = 0; 8916 v75 = 0;
8917 v21 = (unsigned __int16 *)v22->pLevelOfDetail0; 8917 v21 = (unsigned __int16 *)v22->pLevelOfDetail0_prolly_alpha_mask;
8918 } 8918 }
8919 a1.pTextureLOD = v21; 8919 a1.pTextureLOD = v21;
8920 LABEL_12: 8920 LABEL_12:
8921 if ( v21 ) 8921 if ( v21 )
8922 { 8922 {
9169 v44 = 2; 9169 v44 = 2;
9170 if ( v43 < mipmapping_terrain_mm1 << 16 ) 9170 if ( v43 < mipmapping_terrain_mm1 << 16 )
9171 { 9171 {
9172 v20 = v3->pTexture; 9172 v20 = v3->pTexture;
9173 v44 = 0; 9173 v44 = 0;
9174 v21 = (unsigned __int16 *)v20->pLevelOfDetail0; 9174 v21 = (unsigned __int16 *)v20->pLevelOfDetail0_prolly_alpha_mask;
9175 LABEL_11: 9175 LABEL_11:
9176 a1.pTextureLOD = v21; 9176 a1.pTextureLOD = v21;
9177 goto LABEL_12; 9177 goto LABEL_12;
9178 } 9178 }
9179 if ( v43 < mipmapping_terrain_mm2 << 16 ) 9179 if ( v43 < mipmapping_terrain_mm2 << 16 )
9345 v20 = 2; 9345 v20 = 2;
9346 v35.pTextureLOD = (unsigned __int16 *)v3->pTexture->pLevelOfDetail2; 9346 v35.pTextureLOD = (unsigned __int16 *)v3->pTexture->pLevelOfDetail2;
9347 if ( v17 < mipmapping_terrain_mm1 << 16 ) 9347 if ( v17 < mipmapping_terrain_mm1 << 16 )
9348 { 9348 {
9349 v20 = 0; 9349 v20 = 0;
9350 v21 = (unsigned __int16 *)v3->pTexture->pLevelOfDetail0; 9350 v21 = (unsigned __int16 *)v3->pTexture->pLevelOfDetail0_prolly_alpha_mask;
9351 LABEL_11: 9351 LABEL_11:
9352 v35.pTextureLOD = v21; 9352 v35.pTextureLOD = v21;
9353 goto LABEL_12; 9353 goto LABEL_12;
9354 } 9354 }
9355 if ( v17 < mipmapping_terrain_mm2 << 16 ) 9355 if ( v17 < mipmapping_terrain_mm2 << 16 )
9570 } 9570 }
9571 } 9571 }
9572 else 9572 else
9573 { 9573 {
9574 v16 = 0; 9574 v16 = 0;
9575 v17 = (unsigned __int16 *)v4->pTexture->pLevelOfDetail0; 9575 v17 = (unsigned __int16 *)v4->pTexture->pLevelOfDetail0_prolly_alpha_mask;
9576 } 9576 }
9577 sr.pTextureLOD = v17; 9577 sr.pTextureLOD = v17;
9578 LABEL_14: 9578 LABEL_14:
9579 sr.field_34_palette = (unsigned __int16 *)sr_sub_485E1F(&sr2, v61, v15, v4, pOutdoorCamera->terrain_gamma, 1u, 1); 9579 sr.field_34_palette = (unsigned __int16 *)sr_sub_485E1F(&sr2, v61, v15, v4, pOutdoorCamera->terrain_gamma, 1u, 1);
9580 v18 = v4->ptr_38; 9580 v18 = v4->ptr_38;
9920 } 9920 }
9921 else 9921 else
9922 { 9922 {
9923 v21 = v5->pTexture; 9923 v21 = v5->pTexture;
9924 v49 = 0; 9924 v49 = 0;
9925 pLOD = v21->pLevelOfDetail0; 9925 pLOD = v21->pLevelOfDetail0_prolly_alpha_mask;
9926 } 9926 }
9927 a1a.pTextureLOD = (unsigned __int16 *)pLOD; 9927 a1a.pTextureLOD = (unsigned __int16 *)pLOD;
9928 LABEL_12: 9928 LABEL_12:
9929 if ( !pLOD ) 9929 if ( !pLOD )
9930 return 0; 9930 return 0;
12510 v1 = pMapStats->GetMapInfo(pCurrentMapName); 12510 v1 = pMapStats->GetMapInfo(pCurrentMapName);
12511 if ( v1 ) 12511 if ( v1 )
12512 sprintf(sHouseName, pGlobalTXT_LocalizationStrings[410], pMapStats->pInfos[v1].pName);// "Leave %s" 12512 sprintf(sHouseName, pGlobalTXT_LocalizationStrings[410], pMapStats->pInfos[v1].pName);// "Leave %s"
12513 else 12513 else
12514 strcpy(sHouseName, pGlobalTXT_LocalizationStrings[79]);// "Exit" 12514 strcpy(sHouseName, pGlobalTXT_LocalizationStrings[79]);// "Exit"
12515 result = GUIWindow::Create(0, 0, 640, 480, (enum WindowType)17, 0, (int)sHouseName); 12515 result = GUIWindow::Create(0, 0, 640, 480, WINDOW_ChangeLocation, 0, (int)sHouseName);
12516 pDialogueWindow = result; 12516 pDialogueWindow = result;
12517 return result; 12517 return result;
12518 } 12518 }
12519 12519
12520 //----- (00444D80) -------------------------------------------------------- 12520 //----- (00444D80) --------------------------------------------------------
12675 pMiscTimer->Pause(); 12675 pMiscTimer->Pause();
12676 pEventTimer->Pause(); 12676 pEventTimer->Pause();
12677 dword_5C3418 = v4; 12677 dword_5C3418 = v4;
12678 dword_5C341C = v3; 12678 dword_5C341C = v3;
12679 _591094_decoration = activeLevelDecoration; 12679 _591094_decoration = activeLevelDecoration;
12680 pGUIWindow2 = GUIWindow::Create(0, 0, 640u, 480u, (enum WindowType)19, a4, 0); 12680 pGUIWindow2 = GUIWindow::Create(0, 0, 640u, 480u, WINDOW_GreetingNPC, a4, 0);
12681 pGUIWindow2->CreateButton(61u, 424u, 0x1Fu, 0x28u, 2, 94, 0x6Eu, 1u, 0x31u, "", 0); 12681 pGUIWindow2->CreateButton(61u, 424u, 0x1Fu, 0x28u, 2, 94, 0x6Eu, 1u, 0x31u, "", 0);
12682 pGUIWindow2->CreateButton(177u, 424u, 0x1Fu, 0x28u, 2, 94, 0x6Eu, 2u, 0x32u, "", 0); 12682 pGUIWindow2->CreateButton(177u, 424u, 0x1Fu, 0x28u, 2, 94, 0x6Eu, 2u, 0x32u, "", 0);
12683 pGUIWindow2->CreateButton(292u, 424u, 0x1Fu, 0x28u, 2, 94, 0x6Eu, 3u, 0x33u, "", 0); 12683 pGUIWindow2->CreateButton(292u, 424u, 0x1Fu, 0x28u, 2, 94, 0x6Eu, 3u, 0x33u, "", 0);
12684 pGUIWindow2->CreateButton(407u, 424u, 0x1Fu, 0x28u, 2, 94, 0x6Eu, 4u, 0x34u, "", 0); 12684 pGUIWindow2->CreateButton(407u, 424u, 0x1Fu, 0x28u, 2, 94, 0x6Eu, 4u, 0x34u, "", 0);
12685 } 12685 }